MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

disable insertion of unambiguous static imports in the editor, leave as is for paste code (IDEA-162245)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-10-07 19:40:26 +02:00
parent 11bd6f0101
commit b699ddd6bc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMemberFix.java
+3 -3
View File
@@ -120,15 +120,15 @@ public abstract class StaticImportMemberFix<T extends PsiMember> 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();
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java
+1 -2
View File
@@ -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<HighlightInfo> infos = new ArrayList<>();