generator

babel · Apr 26, 2021 · d7e8868 · d7e8868
1 parent c13e528
commit d7e8868
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/packages/babel-generator/src/generators/typescript.ts b/packages/babel-generator/src/generators/typescript.ts
@@ -649,10 +649,6 @@ export function tsPrintClassMemberModifiers(this: Printer, node: any, isField) {
     this.word("declare");
     this.space();
   }
-  if (node.override) {
-    this.word("override");
-    this.space();
-  }
   if (node.accessibility) {
     this.word(node.accessibility);
     this.space();
@@ -661,6 +657,10 @@ export function tsPrintClassMemberModifiers(this: Printer, node: any, isField) {
     this.word("static");
     this.space();
   }
+  if (node.override) {
+    this.word("override");
+    this.space();
+  }
   if (node.abstract) {
     this.word("abstract");
     this.space();

diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifier-override/input.js b/packages/babel-generator/test/fixtures/typescript/class-modifier-override/input.js
@@ -1,8 +1,6 @@
 class MyClass extends BaseClass {
   override show() {}
-  override public show() {}
   public override show() {}
   override size = 5;
-  override readonly size = 5;
-  readonly override size = 5;
+  public static override readonly size = 5;
 }
diff --git a/packages/babel-generator/test/fixtures/typescript/class-modifier-override/output.js b/packages/babel-generator/test/fixtures/typescript/class-modifier-override/output.js
@@ -1,11 +1,8 @@
 class MyClass extends BaseClass {
   override show() {}
 
-  override public show() {}
-
-  override public show() {}
+  public override show() {}
 
   override size = 5;
-  override readonly size = 5;
-  override readonly size = 5;
-}
+  public static override readonly size = 5;
+}