Revert "Fix ExpectType with extra whitespace (microsoft#1011)" (microsoft#1013)

jakebailey · web-flow · commit 5476570070bf · 2024-06-20T16:18:37.000-07:00
diff --git a/.changeset/rude-ways-unite.md b/.changeset/rude-ways-unite.md
@@ -0,0 +1,5 @@
+---
+"@definitelytyped/eslint-plugin": patch
+---
+
+Revert ExpectType bugfix
diff --git a/packages/eslint-plugin/src/rules/expect.ts b/packages/eslint-plugin/src/rules/expect.ts
@@ -401,7 +401,7 @@ function parseAssertions(sourceFile: ts.SourceFile): Assertions {
   const duplicates: number[] = [];
 
   const { text } = sourceFile;
-  const commentRegexp = /\/\/\s*\$ExpectType\s+(.*)/g;
+  const commentRegexp = /\/\/(.*)/g;
   const lineStarts = sourceFile.getLineStarts();
   let curLine = 0;
 
@@ -410,8 +410,13 @@ function parseAssertions(sourceFile: ts.SourceFile): Assertions {
     if (commentMatch === null) {
       break;
     }
+    // Match on the contents of that comment so we do nothing in a commented-out assertion,
+    // i.e. `// foo; // $ExpectType number`
+    if (!commentMatch[1].startsWith(" $ExpectType ")) {
+      continue;
+    }
     const line = getLine(commentMatch.index);
-    const expectedType = commentMatch[1].trim();
+    const expectedType = commentMatch[1].slice(" $ExpectType ".length);
     // Don't bother with the assertion if there are 2 assertions on 1 line. Just fail for the duplicate.
     if (typeAssertions.delete(line)) {
       duplicates.push(line);
diff --git a/packages/eslint-plugin/test/__file_snapshots__/types/expect/expect-tests.ts.lint b/packages/eslint-plugin/test/__file_snapshots__/types/expect/expect-tests.ts.lint
@@ -3,12 +3,12 @@ types/expect/expect-tests.ts
   number
 got:
   1234                                                                    @definitelytyped/expect
-  16:1  error  TypeScript expected type to be:
+  14:1  error  TypeScript expected type to be:
   NotRightAtAll
 got:
   1234                                                             @definitelytyped/expect
-  47:1  error  Cannot match a node to this assertion. If this is a multiline function call, ensure the assertion is on the line above  @definitelytyped/expect
-  51:1  error  Cannot match a node to this assertion. If this is a multiline function call, ensure the assertion is on the line above  @definitelytyped/expect
+  45:1  error  Cannot match a node to this assertion. If this is a multiline function call, ensure the assertion is on the line above  @definitelytyped/expect
+  49:1  error  Cannot match a node to this assertion. If this is a multiline function call, ensure the assertion is on the line above  @definitelytyped/expect
 
 ✖ 4 problems (4 errors, 0 warnings)
 
@@ -30,8 +30,6 @@ got:
     // $ExpectType 1234
     expect.foo;
     
-    //    $ExpectType     1234   
-    expect.foo;
     
     // $ExpectType NotRightAtAll
     expect.foo;
diff --git a/packages/eslint-plugin/test/fixtures/types/expect/expect-tests.ts b/packages/eslint-plugin/test/fixtures/types/expect/expect-tests.ts
@@ -9,8 +9,6 @@ expect.foo;
 // $ExpectType 1234
 expect.foo;
 
-//    $ExpectType     1234   
-expect.foo;
 
 // $ExpectType NotRightAtAll
 expect.foo;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@definitelytyped/eslint-plugin": patch
 +---
++
 +Revert ExpectType bugfix