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

Target tracing fixed for qualified names

Browse Source
This commit is contained in:
Andrey Breslav
2011-09-02 14:22:04 +04:00
parent 047945ffff
commit 3680d97107
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+5 -3
View File
@@ -279,15 +279,17 @@ public class TypeResolver {
} }
JetUserType qualifier = userType.getQualifier(); JetUserType qualifier = userType.getQualifier();
NamespaceDescriptor namespace;
if (qualifier != null) { if (qualifier != null) {
NamespaceDescriptor domain = resolveNamespace(scope, qualifier); NamespaceDescriptor domain = resolveNamespace(scope, qualifier);
if (domain == null) { if (domain == null) {
return null; return null;
} }
return domain.getMemberScope().getNamespace(userType.getReferencedName()); namespace = domain.getMemberScope().getNamespace(userType.getReferencedName());
}
else {
namespace = scope.getNamespace(userType.getReferencedName());
} }
NamespaceDescriptor namespace = scope.getNamespace(userType.getReferencedName());
if (namespace != null) { if (namespace != null) {
trace.record(BindingContext.REFERENCE_TARGET, userType.getReferenceExpression(), namespace); trace.record(BindingContext.REFERENCE_TARGET, userType.getReferenceExpression(), namespace);
} }