From 8ac3961a3defcd9a6b290dc2d67f59738c405da6 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 9 Feb 2012 20:36:24 +0400 Subject: [PATCH] Fix imports from JavaDescriptorResolver --- .../jet/plugin/quickfix/ImportClassHelper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java index 19c202ec5ab..f9a744a0059 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java @@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; +import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.JetPluginUtil; @@ -41,9 +42,16 @@ public class ImportClassHelper { * @param file File where directive should be added. */ public static void addImportDirective(@NotNull String importString, @NotNull JetFile file) { - + + // TODO: hack + if (importString.startsWith(JavaDescriptorResolver.JAVA_ROOT + ".")) { + importString = importString.substring((JavaDescriptorResolver.JAVA_ROOT + ".").length()); + } + // Check that import is useless - if (JetPsiUtil.getFQName(file).equals(QualifiedNamesUtil.withoutLastSegment(importString))) { + if (QualifiedNamesUtil.isOneSegmentFQN(importString) || + JetPsiUtil.getFQName(file).equals(QualifiedNamesUtil.withoutLastSegment(importString))) { + return; }