fixed files form Closure #95

Spirals-Team · Mar 7, 2017 · f5c3303 · f5c3303
1 parent b9a1498
commit f5c3303
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/projects/Closure/95/com/google/javascript/jscomp/TypedScopeCreator.java b/projects/Closure/95/com/google/javascript/jscomp/TypedScopeCreator.java
@@ -896,9 +896,16 @@ void defineSlot(Node n, Node parent, JSType type, boolean inferred) {
       // scope where the root object appears. This helps out people
       // who declare "global" names in an anonymous namespace.
       Scope scopeToDeclareIn = scope;
+      if (n.getType() == Token.GETPROP && !scope.isGlobal() &&
+          isQnameRootedInGlobalScope(n)) {
+        Scope globalScope = scope.getGlobalScope();
 
         // don't try to declare in the global scope if there's
         // already a symbol there with this name.
+        if (!globalScope.isDeclared(variableName, false)) {
+          scopeToDeclareIn = scope.getGlobalScope();
+        }
+      }
 
       // declared in closest scope?
       if (scopeToDeclareIn.isDeclared(variableName, false)) {