KT-955 Unable to import a Kotlin package into a Kotlin file with no package header

2012-01-13 18:18:18 +04:00
parent 8e85962856
commit a07e164076
2 changed files with 34 additions and 0 deletions
@@ -585,6 +585,12 @@ public class JavaDescriptorResolver {
    }

    public NamespaceDescriptor resolveNamespace(String qualifiedName) {
+        // First, let's check that there is no Kotlin package:
+        NamespaceDescriptor kotlinNamespaceDescriptor = semanticServices.getKotlinNamespaceDescriptor(qualifiedName);
+        if (kotlinNamespaceDescriptor != null) {
+            return kotlinNamespaceDescriptor;
+        }
+
        PsiPackage psiPackage = findPackage(qualifiedName);
        if (psiPackage == null) {
            PsiClass psiClass = findClass(qualifiedName);