Es6ToEs3ClassSideInheritance - handle let and const

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=191441255
google · Apr 4, 2018 · 1099cc5 · 1099cc5
1 parent 5a68bc0
commit 1099cc5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/src/com/google/javascript/jscomp/Es6ToEs3ClassSideInheritance.java b/src/com/google/javascript/jscomp/Es6ToEs3ClassSideInheritance.java
@@ -311,8 +311,10 @@ public void visit(NodeTraversal t, Node n, Node parent) {
             visitDefinedPropertiesCall(t, n);
           }
           break;
+        case CONST:
+        case LET:
         case VAR:
-          visitVar(n);
+          visitVariableDeclaration(n);
           break;
         case ASSIGN:
           visitAssign(t, n);
@@ -383,7 +385,7 @@ private void visitAssign(NodeTraversal t, Node n) {
       }
     }
 
-    private void visitVar(Node n) {
+    private void visitVariableDeclaration(Node n) {
       Node child = n.getFirstChild();
       if (!child.hasChildren()) {
         return;

diff --git a/test/com/google/javascript/jscomp/Es6ToEs3ClassSideInheritanceTest.java b/test/com/google/javascript/jscomp/Es6ToEs3ClassSideInheritanceTest.java
@@ -491,6 +491,28 @@ public void testAliasing() {
             "/** @suppress {visibility} */",
             "Bar.prop = aliasFoo.prop;"));
 
+    test(
+        lines(
+            "let x = 1;",
+            "/** @constructor */",
+            "function Foo() {}",
+            "Foo.prop = 123;",
+            "const aliasFoo = Foo;", // make sure a const alias works
+            "/** @constructor @extends {aliasFoo} */",
+            "function Bar() {}",
+            "$jscomp.inherits(Bar, aliasFoo);"),
+        lines(
+            "let x = 1;",
+            "/** @constructor */",
+            "function Foo() {}",
+            "Foo.prop = 123;",
+            "const aliasFoo = Foo;", // make sure a const alias works
+            "/** @constructor @extends {aliasFoo} */",
+            "function Bar() {}",
+            "$jscomp.inherits(Bar, aliasFoo);",
+            "/** @suppress {visibility} */",
+            "Bar.prop = aliasFoo.prop;"));
+
     test(
         lines(
             "let x = 1;",
@@ -528,6 +550,19 @@ public void testScopeHandling() {
             "function Bar() {}",
             "$jscomp.inherits(Bar, Foo);"));
 
+    testSame(
+        lines(
+            "/** @constructor */",
+            "let Foo = function() {}", // make sure let works
+            "",
+            "function f() {",
+            "  let Foo = {};",
+            "  Foo.prop = 123;", // Not a reference to the Foo class, so no change.
+            "}",
+            "/** @constructor @extends {Foo} */",
+            "function Bar() {}",
+            "$jscomp.inherits(Bar, Foo);"));
+
     testSame(
         lines(
             "/** @constructor */",