cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(language-service): Return ts.Diagnostic[] for getDiagnostics (#32115)

Browse Source 
Part 2/3 of language service refactoring:
Now that the language service is a proper tsserver plugin, all LS
interfaces should return TS values. This PR refactors the
ng.getDiagnostics() API to return ts.Diagnostic[] instead of
ng.Diagnostic[].

PR Close #32115
This commit is contained in:
Keen Yee Liau
2019-08-09 15:52:49 -07:00
committed by Kara Erickson
parent a91ab15525
commit a5f39aeda6
7 changed files with 117 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/language-service/test/diagnostics_spec.ts
View File

@ -34,7 +34,7 @@ describe('diagnostics', () => {
describe('for semantic errors', () => {
const fileName = '/app/test.ng';
function diagnostics(template: string): Diagnostics {
function diagnostics(template: string): ts.Diagnostic[] {
try {
mockHost.override(fileName, template);
return ngService.getDiagnostics(fileName) !;
@ -185,7 +185,7 @@ describe('diagnostics', () => {
addCode(code, fileName => {
const diagnostic = findDiagnostic(ngService.getDiagnostics(fileName) !, 'pipe') !;
expect(diagnostic).not.toBeUndefined();
expect(diagnostic.span.end - diagnostic.span.start).toBeLessThan(11);
expect(diagnostic.length).toBeLessThan(11);
});
});
@ -379,13 +379,13 @@ describe('diagnostics', () => {
}
}
function expectOnlyModuleDiagnostics(diagnostics: Diagnostics | undefined) {
function expectOnlyModuleDiagnostics(diagnostics: ts.Diagnostic[] | undefined) {
// Expect only the 'MyComponent' diagnostic
if (!diagnostics) throw new Error('Expecting Diagnostics');
if (diagnostics.length > 1) {
const unexpectedDiagnostics =
diagnostics.filter(diag => !diagnosticMessageContains(diag.message, 'MyComponent'))
.map(diag => `(${diag.span.start}:${diag.span.end}): ${diag.message}`);
diagnostics.filter(diag => !diagnosticMessageContains(diag.messageText, 'MyComponent'))
.map(diag => `(${diag.start}:${diag.start! + diag.length!}): ${diag.messageText}`);
if (unexpectedDiagnostics.length) {
fail(`Unexpected diagnostics:\n ${unexpectedDiagnostics.join('\n ')}`);
@ -393,7 +393,7 @@ describe('diagnostics', () => {
}
}
expect(diagnostics.length).toBe(1);
expect(diagnosticMessageContains(diagnostics[0].message, 'MyComponent')).toBeTruthy();
expect(diagnosticMessageContains(diagnostics[0].messageText, 'MyComponent')).toBeTruthy();
}
});
});