Skip to content

fix(language-service): The suppress diagnostics option should work for external templates #57873

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

Closed
dylhunn wants to merge 1 commit into from
Closed

fix(language-service): The suppress diagnostics option should work for external templates #57873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 19 additions & 6 deletions packages/language-service/src/language_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ import {ActiveRefactoring, allRefactorings} from './refactorings/refactoring';

type LanguageServiceConfig = Omit<PluginConfig, 'angularOnly'>;

// Whether the language service should suppress the below for google3.
const enableG3Suppression = false;

// The Copybara config that syncs the language service into g3 will be patched to
// always suppress any diagnostics in this list.
// See `angular2/copy.bara.sky` for more information.
const suppressDiagnosticsInG3: number[] = [
parseInt(`-99${ErrorCode.COMPONENT_RESOURCE_NOT_FOUND}`),
];

export class LanguageService {
private options: CompilerOptions;
readonly compilerFactory: CompilerFactory;
Expand Down Expand Up @@ -83,17 +93,12 @@ export class LanguageService {

getSemanticDiagnostics(fileName: string): ts.Diagnostic[] {
return this.withCompilerAndPerfTracing(PerfPhase.LsDiagnostics, (compiler) => {
const diagnostics: ts.Diagnostic[] = [];
let diagnostics: ts.Diagnostic[] = [];
if (isTypeScriptFile(fileName)) {
const program = compiler.getCurrentProgram();
const sourceFile = program.getSourceFile(fileName);
if (sourceFile) {
let ngDiagnostics = compiler.getDiagnosticsForFile(sourceFile, OptimizeFor.SingleFile);
if (this.config.suppressAngularDiagnosticCodes) {
ngDiagnostics = ngDiagnostics.filter(
(diag) => !this.config.suppressAngularDiagnosticCodes!.includes(diag.code),
);
}
// There are several kinds of diagnostics returned by `NgCompiler` for a source file:
//
// 1. Angular-related non-template diagnostics from decorated classes within that
Expand Down Expand Up @@ -130,6 +135,14 @@ export class LanguageService {
}
}
}
if (this.config.suppressAngularDiagnosticCodes) {
diagnostics = diagnostics.filter(
(diag) => !this.config.suppressAngularDiagnosticCodes!.includes(diag.code),
);
}
if (enableG3Suppression) {
diagnostics = diagnostics.filter((diag) => !suppressDiagnosticsInG3.includes(diag.code));
}
return diagnostics;
});
}
Expand Down