Commit6b6fcd7

kyliau

authored and

mhevery

committed

fix(language-service): do not return external template that does not exist (#39898)

There is a bug in tsserver that causes it to crash when it tries to createscript info for an external template that does not exist.I've submitted an upstream PRmicrosoft/TypeScript#41737 to fix this, but beforethe commit lands in the stable release, we'll have to workaround the issuein language service.Closeangular/vscode-ng-language-service#1001PRClose#39898

1 parent3680ad1 commit6b6fcd7Copy full SHA for 6b6fcd7

File tree

2 files changed

+17

-2

lines changed

packages/language-service
- src
  - ts_plugin.ts
- test
  - ts_plugin_spec.ts

2 files changed

+17

-2

lines changed

`‎packages/language-service/src/ts_plugin.ts‎`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,16 @@ export function getExternalFiles(project: tss.server.Project): string[] {`
`29`	`29`	`return[];`
`30`	`30`	`}`
`31`	`31`	`constngLsHost=PROJECT_MAP.get(project);`
`32`		`-ngLsHost?.getAnalyzedModules();`
`33`		`-returnngLsHost?.getExternalTemplates()\|\|[];`
	`32`	`+if(ngLsHost===undefined){`
	`33`	`+return[];`
	`34`	`+}`
	`35`	`+ngLsHost.getAnalyzedModules();`
	`36`	`+returnngLsHost.getExternalTemplates().filter(fileName=>{`
	`37`	`+// TODO(kyliau): Remove this when the following PR lands on the version of`
	`38`	`+// TypeScript used in this repo.`
	`39`	`+// https://github.com/microsoft/TypeScript/pull/41737`
	`40`	`+returnproject.fileExists(fileName);`
	`41`	`+});`
`34`	`42`	`}`
`35`	`43`
`36`	`44`	`exportfunctioncreate(info:tss.server.PluginCreateInfo):tss.LanguageService{`

`‎packages/language-service/test/ts_plugin_spec.ts‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ const mockProject = {`
`21`	`21`	`},`
`22`	`22`	`},`
`23`	`23`	`hasRoots:()=>true,`
	`24`	`+fileExists:()=>true,`
`24`	`25`	`}asany;`
`25`	`26`
`26`	`27`	`describe('plugin',()=>{`
`@@ -136,6 +137,12 @@ describe('plugin', () => {`
`136`	`137`	`'/app/test.ng',`
`137`	`138`	`]);`
`138`	`139`	`});`
	`140`	`+`
	`141`	`+it('should not return external template that does not exist',()=>{`
	`142`	`+spyOn(mockProject,'fileExists').and.returnValue(false);`
	`143`	`+constexternalTemplates=getExternalFiles(mockProject);`
	`144`	`+expect(externalTemplates.length).toBe(0);`
	`145`	`+});`
`139`	`146`	`});`
`140`	`147`
`141`	`148`	describe(`with config 'angularOnly = true`,()=>{

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6b6fcd7

File tree

2 files changed

2 files changed

`‎packages/language-service/src/ts_plugin.ts‎`

`‎packages/language-service/test/ts_plugin_spec.ts‎`

0 commit comments