azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix imports from JavaDescriptorResolver

Browse Source
This commit is contained in:
Nikolay Krasko
2012-02-09 20:36:24 +04:00
parent 93bdc45d48
commit 8ac3961a3d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassHelper.java
+9 -1
View File
@@ -5,6 +5,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade; 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.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetPluginUtil; import org.jetbrains.jet.plugin.JetPluginUtil;
@@ -42,8 +43,15 @@ public class ImportClassHelper {
*/ */
public static void addImportDirective(@NotNull String importString, @NotNull JetFile file) { 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 // 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; return;
} }