fix(ts-estree): align typeArguments and typeParameters across nodes (#223)

armano2 · JamesHenry · commit 33061987c0cf · 2019-02-06T20:17:44.000-05:00
diff --git a/packages/parser/tests/lib/__snapshots__/typescript.ts.snap b/packages/parser/tests/lib/__snapshots__/typescript.ts.snap
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-arguments-in-call-expression.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-arguments-in-call-expression.src.ts
@@ -0,0 +1 @@
+foo<>();
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-arguments-in-new-expression.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-arguments-in-new-expression.src.ts
@@ -0,0 +1 @@
+new Foo<>()
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-arrow-function.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-arrow-function.src.ts
@@ -0,0 +1 @@
+function f1<>() {}
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-constructor.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-constructor.src.ts
@@ -0,0 +1,3 @@
+class foo {
+  constructor<>() {}
+}
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-function-expression.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-function-expression.src.ts
@@ -0,0 +1 @@
+const foo = function<>() {}
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-method-signature.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-method-signature.src.ts
@@ -0,0 +1,3 @@
+interface foo {
+  test<>();
+}
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-method.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters-in-method.src.ts
@@ -0,0 +1,3 @@
+class foo {
+  test<>() {}
+}
diff --git a/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters.src.ts b/packages/shared-fixtures/fixtures/typescript/errorRecovery/empty-type-parameters.src.ts
@@ -0,0 +1 @@
+function f1<>() {}
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -690,7 +690,7 @@ export class Converter {
         }
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -897,7 +897,7 @@ export class Converter {
         }
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           method.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -1003,7 +1003,7 @@ export class Converter {
         });
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           constructor.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -1060,7 +1060,7 @@ export class Converter {
         }
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -1159,7 +1159,7 @@ export class Converter {
         }
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -1368,7 +1368,7 @@ export class Converter {
           }
         }
 
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -1640,7 +1640,7 @@ export class Converter {
           callee: this.convertChild(node.expression),
           arguments: node.arguments.map(el => this.convertChild(el))
         });
-        if (node.typeArguments && node.typeArguments.length) {
+        if (node.typeArguments) {
           result.typeParameters = this.convertTypeArgumentsToTypeParameters(
             node.typeArguments
           );
@@ -1656,7 +1656,7 @@ export class Converter {
             ? node.arguments.map(el => this.convertChild(el))
             : []
         });
-        if (node.typeArguments && node.typeArguments.length) {
+        if (node.typeArguments) {
           result.typeParameters = this.convertTypeArgumentsToTypeParameters(
             node.typeArguments
           );
@@ -2060,7 +2060,7 @@ export class Converter {
         }
 
         // Process typeParameters
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
@@ -2216,7 +2216,7 @@ export class Converter {
           expression: this.convertChild(node.expression)
         });
 
-        if (node.typeArguments && node.typeArguments.length) {
+        if (node.typeArguments) {
           result.typeParameters = this.convertTypeArgumentsToTypeParameters(
             node.typeArguments
           );
@@ -2236,7 +2236,7 @@ export class Converter {
           id: this.convertChild(node.name)
         });
 
-        if (node.typeParameters && node.typeParameters.length) {
+        if (node.typeParameters) {
           result.typeParameters = this.convertTSTypeParametersToTypeParametersDeclaration(
             node.typeParameters
           );
diff --git a/packages/typescript-estree/tests/ast-alignment/utils.ts b/packages/typescript-estree/tests/ast-alignment/utils.ts
@@ -262,7 +262,10 @@ export function preprocessBabylonAST(ast: any): any {
         /**
          * babel issue: ranges of typeParameters are not included in FunctionExpression range
          */
-        if (node.typeParameters) {
+        if (
+          node.typeParameters &&
+          node.typeParameters.range[0] < node.range[0]
+        ) {
           node.range[0] = node.typeParameters.range[0];
           node.loc.start = Object.assign({}, node.typeParameters.loc.start);
         }
diff --git a/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap
@@ -2075,6 +2075,22 @@ Object {
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-arguments.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-arguments-in-call-expression.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-arguments-in-new-expression.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters-in-arrow-function.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters-in-constructor.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters-in-function-expression.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters-in-method.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/empty-type-parameters-in-method-signature.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/enum-with-keywords.src 1`] = `
 Object {
   "column": 7,
diff --git a/packages/typescript-estree/tests/lib/__snapshots__/typescript.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/typescript.ts.snap

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class foo {`
	`2`	`+ constructor<>() {}`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+interface foo {`
	`2`	`+ test<>();`
	`3`	`+}`