fixed files form Closure #89

Spirals-Team · Mar 7, 2017 · 54d0aa0 · 54d0aa0
1 parent 81ffbf4
commit 54d0aa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/projects/Closure/89/com/google/javascript/jscomp/CollapseProperties.java b/projects/Closure/89/com/google/javascript/jscomp/CollapseProperties.java
@@ -481,6 +481,9 @@ private void updateSimpleDeclaration(String alias, Name refName, Ref ref) {
     Node greatGramps = gramps.getParent();
     Node greatGreatGramps = greatGramps.getParent();
 
+    if (rvalue != null && rvalue.getType() == Token.FUNCTION) {
+      checkForHosedThisReferences(rvalue, refName.docInfo, refName);
+    }
 
     // Create the new alias node.
     Node nameNode = NodeUtil.newName(

diff --git a/projects/Closure/89/com/google/javascript/jscomp/GlobalNamespace.java b/projects/Closure/89/com/google/javascript/jscomp/GlobalNamespace.java
@@ -917,7 +917,7 @@ boolean canCollapseUnannotatedChildNames() {
       }
 
       // If this is aliased, then its properties can't be collapsed either.
-      if (type != Type.FUNCTION && aliasingGets > 0) {
+      if (aliasingGets > 0) {
         return false;
       }