return commit after merge

'Fixed UnsupportedOperationException when a namespace is used in place of an expression.'
2013-02-07 21:02:59 +04:00
parent d149218e1d
commit 3014275982
1 changed files with 3 additions and 0 deletions
@@ -218,6 +218,9 @@ public class CallExpressionResolver {
        JetType type = getVariableType(nameExpression, receiver, callOperationNode, context.replaceBindingTrace(traceForVariable), result);
        if (result[0]) {
            traceForVariable.commit();
+            if (type instanceof NamespaceType && !context.namespacesAllowed) {
+                type = null;
+            }
            return JetTypeInfo.create(type, context.dataFlowInfo);
        }