Skip to content

Commit 55c3b91

Browse files
kyliauKeen Yee Liau
authored andcommitted
fix: do not retrieve language service if it's disabled
This is the first part to partially address #391 When non-Angular TypeScript projects are opened, the Angular language service should be disabled. Once it's disabled, the server should not call `getLanguageService()`.
1 parent d2336f0 commit 55c3b91

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

server/src/project_service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class ProjectService {
159159
continue;
160160
}
161161
const project = this.getDefaultProjectForScriptInfo(scriptInfo);
162-
if (!project) {
162+
if (!project || !project.languageServiceEnabled) {
163163
continue;
164164
}
165165
const ngLS = project.getLanguageService();

server/src/server.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ connection.onDefinition((params: lsp.TextDocumentPositionParams) => {
160160

161161
const {fileName} = scriptInfo;
162162
const project = projSvc.getDefaultProjectForScriptInfo(scriptInfo);
163-
if (!project) {
163+
if (!project || !project.languageServiceEnabled) {
164164
return;
165165
}
166166

@@ -207,7 +207,7 @@ connection.onHover((params: lsp.TextDocumentPositionParams) => {
207207
}
208208
const {fileName} = scriptInfo;
209209
const project = tsProjSvc.getDefaultProjectForFile(fileName, true /* ensureProject */);
210-
if (!project) {
210+
if (!project || !project.languageServiceEnabled) {
211211
return;
212212
}
213213
const offset = lspPositionToTsPosition(scriptInfo, position);
@@ -253,7 +253,7 @@ connection.onCompletion((params: lsp.CompletionParams) => {
253253
}
254254
const {fileName} = scriptInfo;
255255
const project = projSvc.getDefaultProjectForScriptInfo(scriptInfo);
256-
if (!project) {
256+
if (!project || !project.languageServiceEnabled) {
257257
return;
258258
}
259259
const offset = lspPositionToTsPosition(scriptInfo, position);

0 commit comments

Comments
 (0)