Skip to content

Fix error filtering by comment directives for program diagnostics #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2025
Merged

Fix error filtering by comment directives for program diagnostics #1649

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb8b412
Fix the error filtering
sheetalkamat Aug 29, 2025
ef2cec5
Fix incorrect check for diags
sheetalkamat Aug 29, 2025
05ddd62
Tests
sheetalkamat Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions internal/compiler/program.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -1058,8 +1059,20 @@ func (p *Program) getSemanticDiagnosticsForFileNotFilter(ctx context.Context, so
})
}

if len(sourceFile.CommentDirectives) == 0 {
return diags
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(diags) == 0 || len(sourceFile.CommentDirectives) == 0 {
return diags, nil
}
// Build map of directives by line number
directivesByLine := make(map[int]ast.CommentDirective)
Expand Down Expand Up @@ -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 {
Expand Down
Loading