From 3680d97107fbee30704227f05fb1b274148c758e Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 2 Sep 2011 14:22:04 +0400 Subject: [PATCH] Target tracing fixed for qualified names --- idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java index 74afa4e7c20..7ec333a5cc2 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TypeResolver.java @@ -279,15 +279,17 @@ public class TypeResolver { } JetUserType qualifier = userType.getQualifier(); + NamespaceDescriptor namespace; if (qualifier != null) { NamespaceDescriptor domain = resolveNamespace(scope, qualifier); if (domain == 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) { trace.record(BindingContext.REFERENCE_TARGET, userType.getReferenceExpression(), namespace); }