Translate super calls made in a static context of the form super() to call the corresponding method on the super class.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=70413769

Author: blickly

src/com/google/javascript/jscomp/Es6ToEs3Converter.java

@@ -150,7 +150,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         visitForOf(n, parent);
         break;
       case Token.SUPER:
-        visitSuper(n);
+        visitSuper(n, parent);
         break;
       case Token.STRING_KEY:
         visitStringKey(n);
@@ -238,14 +238,14 @@ private void checkClassReassignment(Node clazz) {
     NodeTraversal.traverse(compiler, enclosingFunction, checkAssigns);
   }
 
-  private void visitSuper(Node node) {
-    Node enclosing = node.getParent();
+  private void visitSuper(Node node, Node parent) {
+    Node enclosing = parent;
     Node potentialCallee = node;
-    if (!enclosing.isCall()) {
-      enclosing = enclosing.getParent();
-      potentialCallee = potentialCallee.getParent();
+    if (!parent.isCall()) {
+      enclosing = parent.getParent();
+      potentialCallee = parent;
     }
-    if (!(enclosing.isCall() && enclosing.getFirstChild() == potentialCallee)) {
+    if (!enclosing.isCall() || enclosing.getFirstChild() != potentialCallee) {
       cannotConvertYet(node, "Only calls to super or to a method of super are supported.");
       return;
     }
@@ -265,11 +265,22 @@ private void visitSuper(Node node) {
 
     Node enclosingMemberDef = NodeUtil.getEnclosingClassMember(node);
     if (enclosingMemberDef.isStaticMember()) {
-      node.getParent().replaceChild(node, clazz.getFirstChild().getNext().cloneTree());
-      Node callTarget = IR.getprop(potentialCallee.detachFromParent(), IR.string("call"));
-      callTarget.useSourceInfoIfMissingFromForTree(enclosing);
+      Node superName = clazz.getFirstChild().getNext();
+      Node callTarget;
+      potentialCallee.detachFromParent();
+      if (potentialCallee == node) {
+        // of the form super()
+        potentialCallee =
+            IR.getprop(superName.cloneTree(), IR.string(enclosingMemberDef.getString()));
+        enclosing.putBooleanProp(Node.FREE_CALL, false);
+      } else {
+        // of the form super.method()
+        potentialCallee.replaceChild(node, superName.cloneTree());
+      }
+      callTarget = IR.getprop(potentialCallee, IR.string("call"));
       enclosing.addChildToFront(callTarget);
       enclosing.addChildAfter(IR.thisNode(), callTarget);
+      enclosing.useSourceInfoIfMissingFromForTree(enclosing);
       compiler.reportCodeChange();
       return;
     }

src/com/google/javascript/rhino/IR.java

@@ -657,6 +657,7 @@ private static boolean mayBeExpression(Node n) {
       case Token.STRING:
       case Token.SUB:
       case Token.THIS:
+      case Token.SUPER:
       case Token.TYPEOF:
       case Token.TRUE:
       case Token.URSH:

test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java

@@ -587,6 +587,22 @@ public void testSuperNew() {
     ), Es6ToEs3Converter.CANNOT_CONVERT_YET);
   }
 
+  public void testSuperCallNonConstructor() {
+    test("class S extends B { static f() { super(); } }", Joiner.on('\n').join(
+        "/** @constructor @struct @extends {B} */",
+        "var S = function() {};",
+        "$jscomp$inherits(S, B);",
+        "$jscomp$copy$properties(S, B);",
+        "S.f=function() { B.f.call(this) }"));
+
+    test("class S extends B { f() { super(); } }", Joiner.on('\n').join(
+        "/** @constructor @struct @extends {B} */",
+        "var S = function() {};",
+        "$jscomp$inherits(S, B);",
+        "$jscomp$copy$properties(S, B);",
+        "S.prototype.f=function() { S.base(this, \"f\") }"));
+  }
+
   public void testStaticMethods() {
     test(Joiner.on('\n').join(
         "class C {",