diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java index 5bdfc70e97e..80430ad6ce4 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java @@ -157,9 +157,7 @@ public class JetAddImportAction implements QuestionAction { public void run() { PsiFile file = element.getContainingFile(); if (!(file instanceof JetFile)) return; - ImportInsertHelper.addImportDirective(selectedImport, - (JetFile) file - ); + ImportInsertHelper.addImportDirectiveIfNeeded(selectedImport, (JetFile) file); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java index 5e425d7df10..29fc4e855d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceToClassesShortening.java @@ -71,7 +71,7 @@ public class ReferenceToClassesShortening { compactReferenceToClass(userType, targetClass); } else if (classifier == null) { - ImportInsertHelper.addImportDirective(DescriptorUtils.getFQName(targetTopLevelClass).toSafe(), file); + ImportInsertHelper.addImportDirectiveIfNeeded(DescriptorUtils.getFQName(targetTopLevelClass).toSafe(), file); compactReferenceToClass(userType, targetClass); } else { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java index cb20bf87d37..5c2360783fb 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java @@ -61,7 +61,7 @@ public class JetClassInsertHandler implements InsertHandler { ImportInsertHelper.addImportDirectiveOrChangeToFqName(fqn, jetFile, context.getStartOffset(), targetElement); } else if (KotlinFrameworkDetector.isJsKotlinModule(jetFile)) { - ImportInsertHelper.addImportDirective(fqn, jetFile); + ImportInsertHelper.addImportDirectiveIfNeeded(fqn, jetFile); } } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java index 75d8509ea30..66ecb3eb409 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java @@ -198,7 +198,7 @@ public class JetFunctionInsertHandler implements InsertHandler { @Override public void run() { FqName fqn = DescriptorUtils.getFQName(functionDescriptor).toSafe(); - ImportInsertHelper.addImportDirective(fqn, file); + ImportInsertHelper.addImportDirectiveIfNeeded(fqn, file); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index e9355e85fa8..3bef16e760e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -62,7 +62,7 @@ public class ImportInsertHelper { return; } for (ClassDescriptor clazz : TypeUtils.getAllClassDescriptors(type)) { - addImportDirective(DescriptorUtils.getFQName(getTopLevelClass(clazz)).toSafe(), file); + addImportDirectiveIfNeeded(DescriptorUtils.getFQName(getTopLevelClass(clazz)).toSafe(), file); } } @@ -72,8 +72,8 @@ public class ImportInsertHelper { * @param importFqn full name of the import * @param file File where directive should be added. */ - public static void addImportDirective(@NotNull FqName importFqn, @NotNull JetFile file) { - addImportDirective(new ImportPath(importFqn, false), file); + public static void addImportDirectiveIfNeeded(@NotNull FqName importFqn, @NotNull JetFile file) { + addImportDirectiveIfNeeded(new ImportPath(importFqn, false), file); } public static void addImportDirectiveOrChangeToFqName(@NotNull FqName importFqn, @NotNull JetFile file, int refOffset, @NotNull PsiElement targetElement) { @@ -108,10 +108,10 @@ public class ImportInsertHelper { return; } } - addImportDirective(new ImportPath(importFqn, false), file); + addImportDirectiveIfNeeded(new ImportPath(importFqn, false), file); } - public static void addImportDirective(@NotNull ImportPath importPath, @NotNull JetFile file) { + public static void addImportDirectiveIfNeeded(@NotNull ImportPath importPath, @NotNull JetFile file) { if (!doNeedImport(importPath, file)) { return; } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java index 3496a3db52b..171b994c245 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java @@ -46,7 +46,7 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - ImportInsertHelper.addImportDirective(new FqName("java.util.ArrayList"), (JetFile) getFile()); + ImportInsertHelper.addImportDirectiveIfNeeded(new FqName("java.util.ArrayList"), (JetFile) getFile()); } }); @@ -58,7 +58,7 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - ImportInsertHelper.addImportDirective(new FqName("java.util.ArrayList"), (JetFile) getFile()); + ImportInsertHelper.addImportDirectiveIfNeeded(new FqName("java.util.ArrayList"), (JetFile) getFile()); } }); @@ -70,7 +70,7 @@ public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - ImportInsertHelper.addImportDirective(new FqName(importString), (JetFile) getFile()); + ImportInsertHelper.addImportDirectiveIfNeeded(new FqName(importString), (JetFile) getFile()); } }); checkResultByFile(getTestName(false) + ".kt.after");