2016-11-22 12:10:23 -05:00
|
|
|
/**
|
|
|
|
* @license
|
2020-05-19 15:08:49 -04:00
|
|
|
* Copyright Google LLC All Rights Reserved.
|
2016-11-22 12:10:23 -05:00
|
|
|
*
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
*/
|
|
|
|
|
|
|
|
import * as ts from 'typescript';
|
|
|
|
|
2020-06-25 17:17:17 -04:00
|
|
|
import {create, getExternalFiles} from '../src/ts_plugin';
|
2019-10-14 18:24:28 -04:00
|
|
|
import {CompletionKind} from '../src/types';
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
import {MockTypescriptHost} from './test_utils';
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
const mockProject = {
|
|
|
|
projectService: {
|
|
|
|
logger: {
|
|
|
|
info() {},
|
|
|
|
hasLevel: () => false,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
hasRoots: () => true,
|
2020-11-30 19:49:06 -05:00
|
|
|
fileExists: () => true,
|
2019-10-14 18:24:28 -04:00
|
|
|
} as any;
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
describe('plugin', () => {
|
|
|
|
const mockHost = new MockTypescriptHost(['/app/main.ts']);
|
|
|
|
const tsLS = ts.createLanguageService(mockHost);
|
2020-04-03 23:57:39 -04:00
|
|
|
const program = tsLS.getProgram()!;
|
2019-10-14 18:24:28 -04:00
|
|
|
const plugin = create({
|
|
|
|
languageService: tsLS,
|
|
|
|
languageServiceHost: mockHost,
|
|
|
|
project: mockProject,
|
|
|
|
serverHost: {} as any,
|
|
|
|
config: {},
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
|
|
|
|
2020-04-03 23:57:39 -04:00
|
|
|
beforeEach(() => {
|
|
|
|
mockHost.reset();
|
|
|
|
});
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should produce TypeScript diagnostics', () => {
|
|
|
|
const fileName = '/foo.ts';
|
|
|
|
mockHost.addScript(fileName, `
|
|
|
|
function add(x: number) {
|
|
|
|
return x + 42;
|
|
|
|
}
|
|
|
|
add('hello');
|
|
|
|
`);
|
|
|
|
const diags = plugin.getSemanticDiagnostics(fileName);
|
|
|
|
expect(diags.length).toBe(1);
|
|
|
|
expect(diags[0].messageText)
|
2020-07-15 06:21:04 -04:00
|
|
|
.toBe(`Argument of type 'string' is not assignable to parameter of type 'number'.`);
|
2019-09-12 18:20:54 -04:00
|
|
|
});
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should not report TypeScript errors on tour of heroes', () => {
|
|
|
|
const compilerDiags = tsLS.getCompilerOptionsDiagnostics();
|
|
|
|
expect(compilerDiags).toEqual([]);
|
|
|
|
const sourceFiles = program.getSourceFiles().filter(f => !f.fileName.endsWith('.d.ts'));
|
fix(language-service): do not treat file URIs as general URLs (#39917)
In the past, the legacy (VE-based) language service would use a
`UrlResolver` instance to resolve file paths, primarily for compiler
resources like external templates. The problem with this is that the
UrlResolver is designed to resolve URLs in general, and so for a path
like `/a/b/#c`, `#c` is treated as hash/fragment rather than as part
of the path, which can lead to unexpected path resolution (f.x.,
`resolve('a/b/#c/d.ts', './d.html')` would produce `'a/b/d.html'` rather
than the expected `'a/b/#c/d.html'`).
This commit resolves the issue by using Node's `path` module to resolve
file paths directly, which aligns more with how resources are resolved
in the Ivy compiler.
The testing story here is not great, and the API for validating a file
path could be a little bit prettier/robust. However, since the VE-based
language service is going into more of a "maintenance mode" now that
there is a clear path for the Ivy-based LS moving forward, I think it is
okay not to spend too much time here.
Closes https://github.com/angular/vscode-ng-language-service/issues/892
Closes https://github.com/angular/vscode-ng-language-service/issues/1001
PR Close #39917
2020-12-01 14:19:24 -05:00
|
|
|
// there are four .ts files in the test project
|
|
|
|
expect(sourceFiles.length).toBe(4);
|
2019-10-14 18:24:28 -04:00
|
|
|
for (const {fileName} of sourceFiles) {
|
|
|
|
const syntacticDiags = tsLS.getSyntacticDiagnostics(fileName);
|
|
|
|
expect(syntacticDiags).toEqual([]);
|
|
|
|
const semanticDiags = tsLS.getSemanticDiagnostics(fileName);
|
|
|
|
expect(semanticDiags).toEqual([]);
|
|
|
|
}
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should not report template errors on tour of heroes', () => {
|
|
|
|
const filesWithTemplates = [
|
|
|
|
// Ignore all '*-cases.ts' files as they intentionally contain errors.
|
|
|
|
'/app/app.component.ts',
|
|
|
|
];
|
|
|
|
for (const fileName of filesWithTemplates) {
|
|
|
|
const diags = plugin.getSemanticDiagnostics(fileName);
|
|
|
|
expect(diags).toEqual([]);
|
|
|
|
}
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should respect paths configuration', () => {
|
|
|
|
const SHARED_MODULE = '/app/foo/bar/shared.ts';
|
|
|
|
const MY_COMPONENT = '/app/my.component.ts';
|
|
|
|
mockHost.overrideOptions({
|
|
|
|
baseUrl: '/app',
|
|
|
|
paths: {'bar/*': ['foo/bar/*']},
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
2019-10-14 18:24:28 -04:00
|
|
|
mockHost.addScript(SHARED_MODULE, `
|
|
|
|
export interface Node {
|
|
|
|
children: Node[];
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
mockHost.addScript(MY_COMPONENT, `
|
|
|
|
import { Component, NgModule } from '@angular/core';
|
|
|
|
import { Node } from 'bar/shared';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'my-component',
|
|
|
|
template: '{{ tree.~{tree}children }}'
|
|
|
|
})
|
|
|
|
export class MyComponent {
|
|
|
|
tree: Node = {
|
|
|
|
children: [],
|
|
|
|
};
|
|
|
|
}
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
@NgModule({
|
|
|
|
declarations: [MyComponent],
|
|
|
|
})
|
|
|
|
export class MyModule {}
|
|
|
|
`);
|
|
|
|
// First, make sure there are no errors in newly added scripts.
|
|
|
|
for (const fileName of [SHARED_MODULE, MY_COMPONENT]) {
|
|
|
|
const syntacticDiags = plugin.getSyntacticDiagnostics(fileName);
|
|
|
|
expect(syntacticDiags).toEqual([]);
|
|
|
|
const semanticDiags = plugin.getSemanticDiagnostics(fileName);
|
|
|
|
expect(semanticDiags).toEqual([]);
|
|
|
|
}
|
|
|
|
const marker = mockHost.getLocationMarkerFor(MY_COMPONENT, 'tree');
|
|
|
|
const completions = plugin.getCompletionsAtPosition(MY_COMPONENT, marker.start, undefined);
|
|
|
|
expect(completions).toBeDefined();
|
2020-04-03 23:57:39 -04:00
|
|
|
expect(completions!.entries).toEqual([
|
2019-10-14 18:24:28 -04:00
|
|
|
{
|
|
|
|
name: 'children',
|
|
|
|
kind: CompletionKind.PROPERTY as any,
|
|
|
|
sortText: 'children',
|
2019-10-24 21:29:24 -04:00
|
|
|
replacementSpan: {start: 182, length: 8},
|
2019-11-15 15:06:00 -05:00
|
|
|
insertText: 'children',
|
2019-10-14 18:24:28 -04:00
|
|
|
},
|
|
|
|
]);
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
2020-06-25 17:17:17 -04:00
|
|
|
|
|
|
|
it('should return external templates when getExternalFiles() is called', () => {
|
|
|
|
const externalTemplates = getExternalFiles(mockProject);
|
fix(language-service): do not treat file URIs as general URLs (#39917)
In the past, the legacy (VE-based) language service would use a
`UrlResolver` instance to resolve file paths, primarily for compiler
resources like external templates. The problem with this is that the
UrlResolver is designed to resolve URLs in general, and so for a path
like `/a/b/#c`, `#c` is treated as hash/fragment rather than as part
of the path, which can lead to unexpected path resolution (f.x.,
`resolve('a/b/#c/d.ts', './d.html')` would produce `'a/b/d.html'` rather
than the expected `'a/b/#c/d.html'`).
This commit resolves the issue by using Node's `path` module to resolve
file paths directly, which aligns more with how resources are resolved
in the Ivy compiler.
The testing story here is not great, and the API for validating a file
path could be a little bit prettier/robust. However, since the VE-based
language service is going into more of a "maintenance mode" now that
there is a clear path for the Ivy-based LS moving forward, I think it is
okay not to spend too much time here.
Closes https://github.com/angular/vscode-ng-language-service/issues/892
Closes https://github.com/angular/vscode-ng-language-service/issues/1001
PR Close #39917
2020-12-01 14:19:24 -05:00
|
|
|
expect(new Set(externalTemplates)).toEqual(new Set([
|
2020-06-25 17:17:17 -04:00
|
|
|
'/app/test.ng',
|
fix(language-service): do not treat file URIs as general URLs (#39917)
In the past, the legacy (VE-based) language service would use a
`UrlResolver` instance to resolve file paths, primarily for compiler
resources like external templates. The problem with this is that the
UrlResolver is designed to resolve URLs in general, and so for a path
like `/a/b/#c`, `#c` is treated as hash/fragment rather than as part
of the path, which can lead to unexpected path resolution (f.x.,
`resolve('a/b/#c/d.ts', './d.html')` would produce `'a/b/d.html'` rather
than the expected `'a/b/#c/d.html'`).
This commit resolves the issue by using Node's `path` module to resolve
file paths directly, which aligns more with how resources are resolved
in the Ivy compiler.
The testing story here is not great, and the API for validating a file
path could be a little bit prettier/robust. However, since the VE-based
language service is going into more of a "maintenance mode" now that
there is a clear path for the Ivy-based LS moving forward, I think it is
okay not to spend too much time here.
Closes https://github.com/angular/vscode-ng-language-service/issues/892
Closes https://github.com/angular/vscode-ng-language-service/issues/1001
PR Close #39917
2020-12-01 14:19:24 -05:00
|
|
|
'/app/#inner/inner.html',
|
|
|
|
]));
|
2020-06-25 17:17:17 -04:00
|
|
|
});
|
2020-11-30 19:49:06 -05:00
|
|
|
|
|
|
|
it('should not return external template that does not exist', () => {
|
|
|
|
spyOn(mockProject, 'fileExists').and.returnValue(false);
|
|
|
|
const externalTemplates = getExternalFiles(mockProject);
|
|
|
|
expect(externalTemplates.length).toBe(0);
|
|
|
|
});
|
2019-10-14 18:24:28 -04:00
|
|
|
});
|
2016-11-22 12:10:23 -05:00
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
describe(`with config 'angularOnly = true`, () => {
|
|
|
|
const mockHost = new MockTypescriptHost(['/app/main.ts']);
|
|
|
|
const tsLS = ts.createLanguageService(mockHost);
|
|
|
|
const plugin = create({
|
|
|
|
languageService: tsLS,
|
|
|
|
languageServiceHost: mockHost,
|
|
|
|
project: mockProject,
|
|
|
|
serverHost: {} as any,
|
|
|
|
config: {
|
|
|
|
angularOnly: true,
|
|
|
|
},
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should not produce TypeScript diagnostics', () => {
|
|
|
|
const fileName = '/foo.ts';
|
|
|
|
mockHost.addScript(fileName, `
|
|
|
|
function add(x: number) {
|
|
|
|
return x + 42;
|
|
|
|
}
|
|
|
|
add('hello');
|
|
|
|
`);
|
|
|
|
const diags = plugin.getSemanticDiagnostics(fileName);
|
|
|
|
expect(diags).toEqual([]);
|
2016-11-22 12:10:23 -05:00
|
|
|
});
|
|
|
|
|
2019-10-14 18:24:28 -04:00
|
|
|
it('should not report template errors on TOH', () => {
|
|
|
|
const filesWithTemplates = [
|
|
|
|
// Ignore all '*-cases.ts' files as they intentionally contain errors.
|
|
|
|
'/app/app.component.ts',
|
|
|
|
'/app/test.ng',
|
|
|
|
];
|
|
|
|
for (const fileName of filesWithTemplates) {
|
|
|
|
const diags = plugin.getSemanticDiagnostics(fileName);
|
|
|
|
expect(diags).toEqual([]);
|
2016-11-22 12:10:23 -05:00
|
|
|
}
|
2019-10-14 18:24:28 -04:00
|
|
|
});
|
|
|
|
});
|