diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 51374a5b4c5..131f50d2956 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -225,8 +225,11 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor.testOther if (QualifiedNamesUtil.isValidJavaFqName(fqName.toString())) { ImportPath importPath = new ImportPath(fqName.toString()); - if (ImportInsertHelper.doNeedImport(importPath, file)) { + if (ImportInsertHelper.needImport(importPath, file)) { return MyResult.notImported; } else { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java index 15b75059d48..30bbf4a5996 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.util.QualifiedNamesUtil; import java.util.*; -import static org.jetbrains.jet.plugin.quickfix.ImportInsertHelper.doNeedImport; +import static org.jetbrains.jet.plugin.quickfix.ImportInsertHelper.needImport; public class JetImportOptimizer implements ImportOptimizer { @Override @@ -75,8 +75,8 @@ public class JetImportOptimizer implements ImportOptimizer { } if (isUseful(importPath, usedQualifiedNames) && - doNeedImport(importPath, jetFile, directivesBeforeCurrent) && - doNeedImport(importPath, jetFile, directivesAfterCurrent)) { + needImport(importPath, jetFile, directivesBeforeCurrent) && + needImport(importPath, jetFile, directivesAfterCurrent)) { directivesBeforeCurrent.add(anImport); } else { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java index 4823d621145..87971854f2d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.java @@ -107,7 +107,7 @@ public class AutoImportFix extends JetHintAction implem @Override public boolean apply(@Nullable FqName fqName) { assert fqName != null; - return ImportInsertHelper.doNeedImport(new ImportPath(fqName, false), (JetFile) file); + return ImportInsertHelper.needImport(new ImportPath(fqName, false), (JetFile) file); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index 8742d1117ee..e937971597e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -88,7 +88,7 @@ public class ImportInsertHelper { new OptimizeImportsProcessor(file.getProject(), file).runWithoutProgress(); } - if (!doNeedImport(importPath, file)) { + if (!needImport(importPath, file)) { return; } @@ -142,11 +142,15 @@ public class ImportInsertHelper { return QualifiedNamesUtil.isImported(defaultImports, importPath); } - public static boolean doNeedImport(@NotNull ImportPath importPath, @NotNull JetFile file) { - return doNeedImport(importPath, file, file.getImportDirectives()); + public static boolean needImport(@NotNull FqName fqName, @NotNull JetFile file) { + return needImport(new ImportPath(fqName, false), file); } - public static boolean doNeedImport(@NotNull ImportPath importPath, @NotNull JetFile file, List importDirectives) { + public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file) { + return needImport(importPath, file, file.getImportDirectives()); + } + + public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file, List importDirectives) { if (importPath.fqnPart().firstSegmentIs(JavaDescriptorResolver.JAVA_ROOT)) { FqName withoutJavaRoot = QualifiedNamesUtil.withoutFirstSegment(importPath.fqnPart()); importPath = new ImportPath(withoutJavaRoot, importPath.isAllUnder(), importPath.getAlias());