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

JET-53 Support import of individual classes from Java packages

Browse Source 
NOTE: imports for classes to be used as namespaces (eg, 'Collections.sort()') do not work yet
This commit is contained in:
Andrey Breslav
2011-05-26 21:09:39 +04:00
parent cc26da07df
commit d69f845902
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+35 -2
View File
@@ -12,7 +12,8 @@ import org.jetbrains.jet.lang.JetSemanticServices;
import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider; import org.jetbrains.jet.lang.cfg.JetFlowInformationProvider;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.JetTypeInferrer;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import java.util.*; import java.util.*;
@@ -133,7 +134,39 @@ public class TopDownAnalyzer {
} }
} }
} else { } else {
throw new UnsupportedOperationException(); ClassifierDescriptor classifierDescriptor = null;
JetSimpleNameExpression referenceExpression = null;
JetExpression importedReference = importDirective.getImportedReference();
if (importedReference instanceof JetDotQualifiedExpression) {
JetDotQualifiedExpression reference = (JetDotQualifiedExpression) importedReference;
JetType type = semanticServices.getTypeInferrer(trace, JetFlowInformationProvider.THROW_EXCEPTION).getTypeWithNamespaces(namespaceScope, reference.getReceiverExpression(), false);
JetExpression selectorExpression = reference.getSelectorExpression();
if (selectorExpression != null) {
referenceExpression = (JetSimpleNameExpression) selectorExpression;
String referencedName = referenceExpression.getReferencedName();
if (type != null && referencedName != null) {
classifierDescriptor = type.getMemberScope().getClassifier(referencedName);
}
}
}
else {
assert importedReference instanceof JetSimpleNameExpression;
referenceExpression = (JetSimpleNameExpression) importedReference;
String referencedName = referenceExpression.getReferencedName();
if (referencedName != null) {
classifierDescriptor = outerScope.getClassifier(referencedName);
}
}
if (classifierDescriptor != null) {
trace.recordReferenceResolution(referenceExpression, classifierDescriptor);
String aliasName = importDirective.getAliasName();
String importedClassifierName = aliasName != null ? aliasName : classifierDescriptor.getName();
namespaceScope.addClassifierAlias(importedClassifierName, classifierDescriptor);
}
} }
} }
idea/testData/checker/ResolveToJava.jet
+8
View File
@@ -2,6 +2,9 @@ import java.*
import util.* import util.*
import <error>utils</error>.* import <error>utils</error>.*
import java.io.PrintStream
import java.lang.Comparable as Com
val l : List<in Int> = new ArrayList<Int>() val l : List<in Int> = new ArrayList<Int>()
fun test(l : java.util.List<Int>) { fun test(l : java.util.List<Int>) {
@@ -34,4 +37,9 @@ fun test(l : java.util.List<Int>) {
System.out?.println(e.getMessage()) System.out?.println(e.getMessage())
} }
new PrintStream("sdf")
val c : Com<Int>? = null
c : java.lang.Comparable<Int>?
} }