Fix detection of super statement in visiting constructor

internal/transformers/runtimesyntax.go

@@ -879,7 +879,7 @@ func (tx *RuntimeSyntaxTransformer) visitConstructorBody(body *ast.Block, constr
 	}
 
 	var superPath []int
-	if ast.IsClassLike(grandparentOfBody) && ast.GetExtendsHeritageClauseElement(grandparentOfBody) != nil {
+	if ast.IsClassLike(grandparentOfConstructor) && ast.GetExtendsHeritageClauseElement(grandparentOfConstructor) != nil {
 		superPath = findSuperStatementIndexPath(rest, 0)
 	}
 

internal/transformers/runtimesyntax_test.go

@@ -431,6 +431,15 @@ func TestParameterPropertyTransformer(t *testing.T) {
     constructor(x) {
         this.x = x;
     }
+}`},
+		{title: "parameter properties with super call", input: `class B {} class C extends B { constructor(public x) { super(); } }`, output: `class B {
+}
+class C extends B {
+    x;
+    constructor(x) {
+        super();
+        this.x = x;
+    }
 }`},
 	}
 

testdata/baselines/reference/submodule/compiler/accessOverriddenBaseClassMember1.js

@@ -32,8 +32,8 @@ class Point {
 class ColoredPoint extends Point {
     color;
     constructor(x, y, color) {
-        this.color = color;
         super(x, y);
+        this.color = color;
     }
     toString() {
         return super.toString() + " color=" + this.color;

testdata/baselines/reference/submodule/compiler/accessOverriddenBaseClassMember1.js.diff

@@ -50,8 +50,8 @@
 +class ColoredPoint extends Point {
 +    color;
 +    constructor(x, y, color) {
-+        this.color = color;
 +        super(x, y);
++        this.color = color;
 +    }
 +    toString() {
 +        return super.toString() + " color=" + this.color;

testdata/baselines/reference/submodule/compiler/autolift4.js

@@ -41,8 +41,8 @@ class Point {
 class Point3D extends Point {
     z;
     constructor(x, y, z, m) {
-        this.z = z;
         super(x, y);
+        this.z = z;
     }
     getDist() {
         return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.m);

testdata/baselines/reference/submodule/compiler/autolift4.js.diff

@@ -48,8 +48,8 @@
 +class Point3D extends Point {
 +    z;
 +    constructor(x, y, z, m) {
-+        this.z = z;
 +        super(x, y);
++        this.z = z;
 +    }
 +    getDist() {
          return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.m);

testdata/baselines/reference/submodule/compiler/baseCheck.js

@@ -51,22 +51,22 @@ class ELocVar extends C {
 class D extends C {
     z;
     constructor(z) {
-        this.z = z;
         super(this.z);
+        this.z = z;
     }
 } // too few params
 class E extends C {
     z;
     constructor(z) {
-        this.z = z;
         super(0, this.z);
+        this.z = z;
     }
 }
 class F extends C {
     z;
     constructor(z) {
-        this.z = z;
         super("hello", this.z);
+        this.z = z;
     }
 } // first param type
 function f() {

testdata/baselines/reference/submodule/compiler/baseCheck.js.diff

@@ -71,8 +71,8 @@
 +class D extends C {
 +    z;
 +    constructor(z) {
-+        this.z = z;
 +        super(this.z);
++        this.z = z;
      }
 -    return E;
 -}(C));
@@ -86,17 +86,17 @@
 +class E extends C {
 +    z;
 +    constructor(z) {
-+        this.z = z;
 +        super(0, this.z);
++        this.z = z;
      }
 -    return F;
 -}(C)); // first param type
 +}
 +class F extends C {
 +    z;
 +    constructor(z) {
-+        this.z = z;
 +        super("hello", this.z);
++        this.z = z;
 +    }
 +} // first param type
  function f() {

testdata/baselines/reference/submodule/compiler/classSideInheritance3.js

@@ -30,8 +30,8 @@ class A {
 class B extends A {
     data;
     constructor(x, data) {
-        this.data = data;
         super(x);
+        this.data = data;
     }
 }
 class C extends A {

testdata/baselines/reference/submodule/compiler/classSideInheritance3.js.diff

@@ -38,8 +38,8 @@
 +class B extends A {
 +    data;
 +    constructor(x, data) {
-+        this.data = data;
 +        super(x);
++        this.data = data;
      }
 -    return B;
 -}(A));

testdata/baselines/reference/submodule/compiler/classUpdateTests.js

@@ -162,31 +162,31 @@ class I extends Object {
 class J extends G {
     p1;
     constructor(p1) {
-        this.p1 = p1;
         super(); // NO ERROR
+        this.p1 = p1;
     }
 }
 class K extends G {
     p1;
     constructor(p1) {
-        this.p1 = p1;
         var i = 0;
         super();
+        this.p1 = p1;
     }
 }
 class L extends G {
     p1;
     constructor(p1) {
-        this.p1 = p1;
         super(); // NO ERROR
+        this.p1 = p1;
     }
 }
 class M extends G {
     p1;
     constructor(p1) {
-        this.p1 = p1;
         var i = 0;
         super();
+        this.p1 = p1;
     }
 }
 //

testdata/baselines/reference/submodule/compiler/classUpdateTests.js.diff

@@ -88,8 +88,8 @@
 +class J extends G {
 +    p1;
 +    constructor(p1) {
-+        this.p1 = p1;
 +        super(); // NO ERROR
++        this.p1 = p1;
      }
 -    return D;
 -}());
@@ -149,12 +149,12 @@
 +class K extends G {
 +    p1;
 +    constructor(p1) {
-+        this.p1 = p1;
          var i = 0;
 -        _this = _super.call(this) || this;
 -        _this.p1 = p1;
 -        return _this;
 +        super();
++        this.p1 = p1;
      }
 -    return K;
 -}(G));
@@ -168,8 +168,8 @@
 +class L extends G {
 +    p1;
 +    constructor(p1) {
-+        this.p1 = p1;
 +        super(); // NO ERROR
++        this.p1 = p1;
      }
 -    return L;
 -}(G));
@@ -181,12 +181,12 @@
 +class M extends G {
 +    p1;
 +    constructor(p1) {
-+        this.p1 = p1;
          var i = 0;
 -        _this = _super.call(this) || this;
 -        _this.p1 = p1;
 -        return _this;
 +        super();
++        this.p1 = p1;
      }
 -    return M;
 -}(G));

testdata/baselines/reference/submodule/compiler/collisionSuperAndPropertyNameAsConstuctorParameter.js

@@ -43,8 +43,8 @@ class b1 extends a {
 class b2 extends a {
     _super;
     constructor(_super) {
-        this._super = _super;
         super();
+        this._super = _super;
     }
 }
 class b3 extends a {
@@ -55,7 +55,7 @@ class b3 extends a {
 class b4 extends a {
     _super;
     constructor(_super) {
-        this._super = _super;
         super();
+        this._super = _super;
     }
 }

testdata/baselines/reference/submodule/compiler/collisionSuperAndPropertyNameAsConstuctorParameter.js.diff

@@ -37,8 +37,8 @@
 +class b2 extends a {
 +    _super;
 +    constructor(_super) {
-+        this._super = _super;
 +        super();
++        this._super = _super;
      }
 -    return b1;
 -}(a));
@@ -63,8 +63,8 @@
 +class b4 extends a {
 +    _super;
 +    constructor(_super) {
-+        this._super = _super;
 +        super();
++        this._super = _super;
      }
 -    return b3;
 -}(a));

testdata/baselines/reference/submodule/compiler/constructorArgs.js

@@ -25,7 +25,7 @@ class Super {
 class Sub extends Super {
     options;
     constructor(options) {
-        this.options = options;
         super(options.value);
+        this.options = options;
     }
 }

testdata/baselines/reference/submodule/compiler/constructorArgs.js.diff

@@ -36,8 +36,8 @@
 +class Sub extends Super {
 +    options;
 +    constructor(options) {
-+        this.options = options;
 +        super(options.value);
++        this.options = options;
      }
 -    return Sub;
 -}(Super));

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js

@@ -26,7 +26,7 @@ class B extends A {
         'someStringForEgngInject';
         "use strict";
         'someStringForEgngInject';
-        this.x = x;
         super();
+        this.x = x;
     }
 }

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js.diff

@@ -41,8 +41,8 @@
 -        return _this;
 +        "use strict";
 +        'someStringForEgngInject';
-+        this.x = x;
 +        super();
++        this.x = x;
      }
 -    return B;
 -}(A));

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js

@@ -26,7 +26,7 @@ class B extends A {
         'someStringForEgngInject';
         "use strict";
         'someStringForEgngInject';
-        this.x = x;
         super();
+        this.x = x;
     }
 }

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitParameterPropertyDeclaration1ES6.js.diff

@@ -14,10 +14,8 @@
      constructor(x) {
          "use strict";
          'someStringForEgngInject';
--        super();
 +        "use strict";
 +        'someStringForEgngInject';
+         super();
          this.x = x;
-+        super();
      }
- }

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js

@@ -27,7 +27,7 @@ class B extends A {
         'someStringForEgngInject';
         "use strict";
         'someStringForEgngInject';
-        this.x = x;
         super();
+        this.x = x;
     }
 }

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js.diff

@@ -43,8 +43,8 @@
 -        return _this;
 +        "use strict";
 +        'someStringForEgngInject';
-+        this.x = x;
 +        super();
++        this.x = x;
      }
 -    return B;
 -}(A));

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js

@@ -27,7 +27,7 @@ class B extends A {
         'someStringForEgngInject';
         "use strict";
         'someStringForEgngInject';
-        this.x = x;
         super();
+        this.x = x;
     }
 }

testdata/baselines/reference/submodule/compiler/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1ES6.js.diff

@@ -15,11 +15,10 @@
      constructor(x) {
          "use strict";
          'someStringForEgngInject';
--        super();
 +        "use strict";
 +        'someStringForEgngInject';
+         super();
          this.x = x;
 -        this.blah = 2;
-+        super();
      }
  }

testdata/baselines/reference/submodule/compiler/es6ClassTest.js

@@ -106,9 +106,9 @@ class Foo extends Bar {
     boo(x) { return x; }
     static statVal = 0;
     constructor(x, y, z = 0) {
+        super(x);
         this.y = y;
         this.z = z;
-        super(x);
         this.x = x;
         this.gar = 5;
     }

testdata/baselines/reference/submodule/compiler/es6ClassTest.js.diff

@@ -57,9 +57,9 @@
 +    boo(x) { return x; }
 +    static statVal = 0;
 +    constructor(x, y, z = 0) {
++        super(x);
 +        this.y = y;
 +        this.z = z;
-+        super(x);
 +        this.x = x;
 +        this.gar = 5;
      }