Merge pull request #21 from mattmccutchen/relatedInformation-cyclic

Clear the `file` fields of `relatedInformation` too. (WIP)
pull/2748/head
Alexandru Dima 7 years ago committed by GitHub
commit 201fa54695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -121,21 +121,33 @@ export class TypeScriptWorker implements ts.LanguageServiceHost {
// --- language features // --- language features
private static clearFiles(diagnostics: ts.Diagnostic[]) {
// Clear the `file` field, which cannot be JSON'yfied because it
// contains cyclic data structures.
diagnostics.forEach(diag => {
diag.file = undefined;
const related = <ts.Diagnostic[]>diag.relatedInformation;
if (related) {
related.forEach(diag2 => diag2.file = undefined);
}
});
}
getSyntacticDiagnostics(fileName: string): Promise<ts.Diagnostic[]> { getSyntacticDiagnostics(fileName: string): Promise<ts.Diagnostic[]> {
const diagnostics = this._languageService.getSyntacticDiagnostics(fileName); const diagnostics = this._languageService.getSyntacticDiagnostics(fileName);
diagnostics.forEach(diag => diag.file = undefined); // diag.file cannot be JSON'yfied TypeScriptWorker.clearFiles(diagnostics);
return Promise.as(diagnostics); return Promise.as(diagnostics);
} }
getSemanticDiagnostics(fileName: string): Promise<ts.Diagnostic[]> { getSemanticDiagnostics(fileName: string): Promise<ts.Diagnostic[]> {
const diagnostics = this._languageService.getSemanticDiagnostics(fileName); const diagnostics = this._languageService.getSemanticDiagnostics(fileName);
diagnostics.forEach(diag => diag.file = undefined); // diag.file cannot be JSON'yfied TypeScriptWorker.clearFiles(diagnostics);
return Promise.as(diagnostics); return Promise.as(diagnostics);
} }
getCompilerOptionsDiagnostics(fileName: string): Promise<ts.Diagnostic[]> { getCompilerOptionsDiagnostics(fileName: string): Promise<ts.Diagnostic[]> {
const diagnostics = this._languageService.getCompilerOptionsDiagnostics(); const diagnostics = this._languageService.getCompilerOptionsDiagnostics();
diagnostics.forEach(diag => diag.file = undefined); // diag.file cannot be JSON'yfied TypeScriptWorker.clearFiles(diagnostics);
return Promise.as(diagnostics); return Promise.as(diagnostics);
} }

Loading…
Cancel
Save