From b699ddd6bc13e2c5acf32e927e9c1dcc6657b246 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Fri, 7 Oct 2016 19:35:22 +0200 Subject: [PATCH] disable insertion of unambiguous static imports in the editor, leave as is for paste code (IDEA-162245) --- .../daemon/impl/quickfix/StaticImportMemberFix.java | 6 +++--- .../codeInsight/daemon/impl/ShowAutoImportPass.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java index 1564729a02b2..808b6f4ead40 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java @@ -120,15 +120,15 @@ public abstract class StaticImportMemberFix implements Inte } final QuestionAction action = createQuestionAction(candidates, element.getProject(), editor); - PsiFile psiFile = element.getContainingFile(); - if (candidates.size() == 1 && + /* PsiFile psiFile = element.getContainingFile(); + if (candidates.size() == 1 && ImportClassFixBase.isAddUnambiguousImportsOnTheFlyEnabled(psiFile) && (ApplicationManager.getApplication().isUnitTestMode() || DaemonListeners.canChangeFileSilently(psiFile)) && !LaterInvocator.isInModalContext()) { CommandProcessor.getInstance().runUndoTransparentAction(() -> action.execute()); return ImportClassFixBase.Result.CLASS_AUTO_IMPORTED; } - +*/ String hintText = ShowAutoImportPass.getMessage(candidates.size() > 1, getMemberPresentableText(candidates.get(0))); if (!ApplicationManager.getApplication().isUnitTestMode() && !HintManager.getInstance().hasShownHintsThatWillHideByOtherHint(true)) { final TextRange textRange = element.getTextRange(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java index ef0938d50670..08af4c2dfdab 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java @@ -99,8 +99,7 @@ public class ShowAutoImportPass extends TextEditorHighlightingPass { if (!DaemonCodeAnalyzerSettings.getInstance().isImportHintEnabled()) return; if (!DaemonCodeAnalyzer.getInstance(myProject).isImportHintsEnabled(myFile)) return; final CodeInsightSettings codeInsightSettings = CodeInsightSettings.getInstance(); - if (!codeInsightSettings.ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY && - !codeInsightSettings.ADD_MEMBER_IMPORTS_ON_THE_FLY) return; + if (!codeInsightSettings.ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY) return; Document document = getDocument(); final List infos = new ArrayList<>();