Fix error filtering by comment directives for program diagnostics

internal/compiler/program.go

@@ -433,7 +433,8 @@ func (p *Program) GetIncludeProcessorDiagnostics(sourceFile *ast.SourceFile) []*
 	if checker.SkipTypeChecking(sourceFile, p.Options(), p, false) {
 		return nil
 	}
-	return p.includeProcessor.getDiagnostics(p).GetDiagnosticsForFile(sourceFile.FileName())
+	filtered, _ := p.getDiagnosticsWithPrecedingDirectives(sourceFile, p.includeProcessor.getDiagnostics(p).GetDiagnosticsForFile(sourceFile.FileName()))
+	return filtered
 }
 
 func (p *Program) getSourceFilesToEmit(targetSourceFile *ast.SourceFile, forceDtsEmit bool) []*ast.SourceFile {
@@ -1058,8 +1059,20 @@ func (p *Program) getSemanticDiagnosticsForFileNotFilter(ctx context.Context, so
 		})
 	}
 
+	filtered, directivesByLine := p.getDiagnosticsWithPrecedingDirectives(sourceFile, diags)
+	for _, directive := range directivesByLine {
+		// Above we changed all used directive kinds to @ts-ignore, so any @ts-expect-error directives that
+		// remain are unused and thus errors.
+		if directive.Kind == ast.CommentDirectiveKindExpectError {
+			filtered = append(filtered, ast.NewDiagnostic(sourceFile, directive.Loc, diagnostics.Unused_ts_expect_error_directive))
+		}
+	}
+	return filtered
+}
+
+func (p *Program) getDiagnosticsWithPrecedingDirectives(sourceFile *ast.SourceFile, diags []*ast.Diagnostic) ([]*ast.Diagnostic, map[int]ast.CommentDirective) {
 	if len(sourceFile.CommentDirectives) == 0 {
-		return diags
+		return diags, nil
 	}
 	// Build map of directives by line number
 	directivesByLine := make(map[int]ast.CommentDirective)
@@ -1089,14 +1102,7 @@ func (p *Program) getSemanticDiagnosticsForFileNotFilter(ctx context.Context, so
 			filtered = append(filtered, diagnostic)
 		}
 	}
-	for _, directive := range directivesByLine {
-		// Above we changed all used directive kinds to @ts-ignore, so any @ts-expect-error directives that
-		// remain are unused and thus errors.
-		if directive.Kind == ast.CommentDirectiveKindExpectError {
-			filtered = append(filtered, ast.NewDiagnostic(sourceFile, directive.Loc, diagnostics.Unused_ts_expect_error_directive))
-		}
-	}
-	return filtered
+	return filtered, directivesByLine
 }
 
 func (p *Program) getDeclarationDiagnosticsForFile(ctx context.Context, sourceFile *ast.SourceFile) []*ast.Diagnostic {

testdata/baselines/reference/compiler/processingDiagnostic.errors.txt

@@ -0,0 +1,25 @@
+/node_modules/foo/index.d.ts(1,23): error TS2688: Cannot find type definition file for 'cookie-session'.
+
+
+==== /tsconfig.json (0 errors) ====
+    {
+        "compilerOptions": {
+            "strict": true,
+        }
+    }
+==== /index.ts (0 errors) ====
+    import { foo } from 'foo';
+    const y = foo;
+
+==== /node_modules/foo/index.d.ts (1 errors) ====
+    /// <reference types="cookie-session"/>
+                          ~~~~~~~~~~~~~~
+!!! error TS2688: Cannot find type definition file for 'cookie-session'.
+    export const foo = 1;
+
+==== /node_modules/foo/package.json (0 errors) ====
+    {
+        "name": "foo",
+        "version": "1.0.0",
+        "types": "index.d.ts"
+    }

testdata/baselines/reference/compiler/processingDiagnostic.js

@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/processingDiagnostic.ts] ////
+
+//// [index.d.ts]
+/// <reference types="cookie-session"/>
+export const foo = 1;
+
+//// [package.json]
+{
+    "name": "foo",
+    "version": "1.0.0",
+    "types": "index.d.ts"
+}
+//// [index.ts]
+import { foo } from 'foo';
+const y = foo;
+
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const foo_1 = require("foo");
+const y = foo_1.foo;

testdata/baselines/reference/compiler/processingDiagnostic.symbols

@@ -0,0 +1,15 @@
+//// [tests/cases/compiler/processingDiagnostic.ts] ////
+
+=== /index.ts ===
+import { foo } from 'foo';
+>foo : Symbol(foo, Decl(index.ts, 0, 8))
+
+const y = foo;
+>y : Symbol(y, Decl(index.ts, 1, 5))
+>foo : Symbol(foo, Decl(index.ts, 0, 8))
+
+=== /node_modules/foo/index.d.ts ===
+/// <reference types="cookie-session"/>
+export const foo = 1;
+>foo : Symbol(foo, Decl(index.d.ts, 1, 12))
+

testdata/baselines/reference/compiler/processingDiagnostic.types

@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/processingDiagnostic.ts] ////
+
+=== /index.ts ===
+import { foo } from 'foo';
+>foo : 1
+
+const y = foo;
+>y : 1
+>foo : 1
+
+=== /node_modules/foo/index.d.ts ===
+/// <reference types="cookie-session"/>
+export const foo = 1;
+>foo : 1
+>1 : 1
+

testdata/baselines/reference/compiler/processingDiagnosticTsIgnore.js

@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/processingDiagnosticTsIgnore.ts] ////
+
+//// [index.d.ts]
+// @ts-ignore
+/// <reference types="cookie-session"/>
+export const foo = 1;
+
+//// [package.json]
+{
+    "name": "foo",
+    "version": "1.0.0",
+    "types": "index.d.ts"
+}
+//// [index.ts]
+import { foo } from 'foo';
+const y = foo;
+
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const foo_1 = require("foo");
+const y = foo_1.foo;

testdata/baselines/reference/compiler/processingDiagnosticTsIgnore.symbols

@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/processingDiagnosticTsIgnore.ts] ////
+
+=== /index.ts ===
+import { foo } from 'foo';
+>foo : Symbol(foo, Decl(index.ts, 0, 8))
+
+const y = foo;
+>y : Symbol(y, Decl(index.ts, 1, 5))
+>foo : Symbol(foo, Decl(index.ts, 0, 8))
+
+=== /node_modules/foo/index.d.ts ===
+// @ts-ignore
+/// <reference types="cookie-session"/>
+export const foo = 1;
+>foo : Symbol(foo, Decl(index.d.ts, 2, 12))
+

testdata/baselines/reference/compiler/processingDiagnosticTsIgnore.types

@@ -0,0 +1,17 @@
+//// [tests/cases/compiler/processingDiagnosticTsIgnore.ts] ////
+
+=== /index.ts ===
+import { foo } from 'foo';
+>foo : 1
+
+const y = foo;
+>y : 1
+>foo : 1
+
+=== /node_modules/foo/index.d.ts ===
+// @ts-ignore
+/// <reference types="cookie-session"/>
+export const foo = 1;
+>foo : 1
+>1 : 1
+

testdata/tests/cases/compiler/processingDiagnostic.ts

@@ -0,0 +1,20 @@
+// @filename: /node_modules/foo/index.d.ts
+/// <reference types="cookie-session"/>
+export const foo = 1;
+
+// @filename: /node_modules/foo/package.json
+{
+    "name": "foo",
+    "version": "1.0.0",
+    "types": "index.d.ts"
+}
+// @filename: /index.ts
+import { foo } from 'foo';
+const y = foo;
+
+// @filename: /tsconfig.json
+{
+    "compilerOptions": {
+        "strict": true,
+    }
+}

testdata/tests/cases/compiler/processingDiagnosticTsIgnore.ts

@@ -0,0 +1,21 @@
+// @filename: /node_modules/foo/index.d.ts
+// @ts-ignore
+/// <reference types="cookie-session"/>
+export const foo = 1;
+
+// @filename: /node_modules/foo/package.json
+{
+    "name": "foo",
+    "version": "1.0.0",
+    "types": "index.d.ts"
+}
+// @filename: /index.ts
+import { foo } from 'foo';
+const y = foo;
+
+// @filename: /tsconfig.json
+{
+    "compilerOptions": {
+        "strict": true,
+    }
+}