fix: templates incorrectly identified as not in Angular project (#1373)

* fix: templates incorrectly identified as not in Angular project

The fix from #1360 unfortunately did not quite work because LSP appears
to return `null` rather than `undefined`. I have not yet found in the
source code where this might happen, but the LSP spec does favor
returning `null` over `undefined` - https://microsoft.github.io/language-server-protocol/specifications/specification-current/.

* refactor: Prefer `null` instead of `undefined` in language server

The LSP spec favors
returning `null` over `undefined` - https://microsoft.github.io/language-server-protocol/specifications/specification-current/.
This commit also updates other locations in the `session` which were
returning `undefined` to be more consistent with LSP return values
(`null`). There is an odd dicotomy here where the TS language service
favors `undefined` instead but the LSP prefers `null`.

(cherry picked from commit 601e2f9)

Author: atscott

client/src/client.ts

@@ -146,7 +146,7 @@ export class AngularLanguageClient implements vscode.Disposable {
       const response = await this.client.sendRequest(IsInAngularProject, {
         textDocument: this.client.code2ProtocolConverter.asTextDocumentIdentifier(doc),
       });
-      if (response === undefined) {
+      if (response == null) {
         // If the response indicates the answer can't be determined at the moment, return `false`
         // but do not cache the result so we can try to get the real answer on follow-up requests.
         return false;

common/requests.ts

@@ -31,7 +31,7 @@ export interface GetTcbResponse {
 }
 
 export const IsInAngularProject =
-    new lsp.RequestType<IsInAngularProjectParams, boolean|undefined, /* error */ void>(
+    new lsp.RequestType<IsInAngularProjectParams, boolean|null, /* error */ void>(
         'angular/isAngularCoreInOwningProject');
 
 export interface IsInAngularProjectParams {

server/src/session.ts

@@ -175,42 +175,42 @@ export class Session {
     conn.onSignatureHelp(p => this.onSignatureHelp(p));
   }
 
-  private isInAngularProject(params: IsInAngularProjectParams): boolean|undefined {
+  private isInAngularProject(params: IsInAngularProjectParams): boolean|null {
     const filePath = uriToFilePath(params.textDocument.uri);
     if (!filePath) {
       return false;
     }
     const lsAndScriptInfo = this.getLSAndScriptInfo(params.textDocument);
     if (!lsAndScriptInfo) {
-      // If we cannot get language service / script info, return undefined to indicate we don't know
+      // If we cannot get language service / script info, return null to indicate we don't know
       // the answer definitively.
-      return undefined;
+      return null;
     }
     const project = this.getDefaultProjectForScriptInfo(lsAndScriptInfo.scriptInfo);
     if (!project) {
-      // If we cannot get project, return undefined to indicate we don't know
+      // If we cannot get project, return null to indicate we don't know
       // the answer definitively.
-      return undefined;
+      return null;
     }
     const angularCore = project.getFileNames().find(isAngularCore);
     return angularCore !== undefined;
   }
 
-  private onGetTcb(params: GetTcbParams): GetTcbResponse|undefined {
+  private onGetTcb(params: GetTcbParams): GetTcbResponse|null {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
-      return undefined;
+    if (lsInfo === null) {
+      return null;
     }
     const {languageService, scriptInfo} = lsInfo;
     const offset = lspPositionToTsPosition(scriptInfo, params.position);
     const response = languageService.getTcb(scriptInfo.fileName, offset);
     if (response === undefined) {
-      return undefined;
+      return null;
     }
     const {fileName: tcfName} = response;
     const tcfScriptInfo = this.projectService.getScriptInfo(tcfName);
     if (!tcfScriptInfo) {
-      return undefined;
+      return null;
     }
     return {
       uri: filePathToUri(tcfName),
@@ -219,10 +219,10 @@ export class Session {
     };
   }
 
-  private onGetComponentsWithTemplateFile(params: any): lsp.Location[]|undefined {
+  private onGetComponentsWithTemplateFile(params: any): lsp.Location[]|null {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
-      return undefined;
+    if (lsInfo === null) {
+      return null;
     }
     const {languageService, scriptInfo} = lsInfo;
     const documentSpans = languageService.getComponentLocationsForTemplate(scriptInfo.fileName);
@@ -238,18 +238,18 @@ export class Session {
     return results;
   }
 
-  private onSignatureHelp(params: lsp.SignatureHelpParams): lsp.SignatureHelp|undefined {
+  private onSignatureHelp(params: lsp.SignatureHelpParams): lsp.SignatureHelp|null {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
-      return undefined;
+    if (lsInfo === null) {
+      return null;
     }
 
     const {languageService, scriptInfo} = lsInfo;
     const offset = lspPositionToTsPosition(scriptInfo, params.position);
 
     const help = languageService.getSignatureHelpItems(scriptInfo.fileName, offset, undefined);
     if (help === undefined) {
-      return undefined;
+      return null;
     }
 
     return {
@@ -289,9 +289,9 @@ export class Session {
     };
   }
 
-  private onCodeLens(params: lsp.CodeLensParams): lsp.CodeLens[]|undefined {
+  private onCodeLens(params: lsp.CodeLensParams): lsp.CodeLens[]|null {
     if (!params.textDocument.uri.endsWith('.html') || !this.isInAngularProject(params)) {
-      return undefined;
+      return null;
     }
     const position = lsp.Position.create(0, 0);
     const topOfDocument = lsp.Range.create(position, position);
@@ -307,7 +307,7 @@ export class Session {
 
   private onCodeLensResolve(params: lsp.CodeLens): lsp.CodeLens {
     const components = this.onGetComponentsWithTemplateFile({textDocument: params.data});
-    if (components === undefined || components.length === 0) {
+    if (components === null || components.length === 0) {
       // While the command is supposed to be optional, vscode will show `!!MISSING: command!!` that
       // fails if you click on it when a command is not provided. Instead, throwing an error will
       // make vscode show the text "no commands" (and it's not a link).
@@ -752,7 +752,7 @@ export class Session {
 
   private onDefinition(params: lsp.TextDocumentPositionParams): lsp.LocationLink[]|undefined {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -767,7 +767,7 @@ export class Session {
 
   private onTypeDefinition(params: lsp.TextDocumentPositionParams): lsp.LocationLink[]|undefined {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -781,7 +781,7 @@ export class Session {
 
   private onRenameRequest(params: lsp.RenameParams): lsp.WorkspaceEdit|undefined {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -810,7 +810,7 @@ export class Session {
       const fileEdits = changes[location.fileName];
 
       const lsInfo = this.getLSAndScriptInfo(location.fileName);
-      if (lsInfo === undefined) {
+      if (lsInfo === null) {
         return changes;
       }
       const range = tsTextSpanToLspRange(lsInfo.scriptInfo, location.textSpan);
@@ -822,10 +822,10 @@ export class Session {
   }
 
   private onPrepareRename(params: lsp.PrepareRenameParams):
-      {range: lsp.Range, placeholder: string}|undefined {
+      {range: lsp.Range, placeholder: string}|null {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
-      return;
+    if (lsInfo === null) {
+      return null;
     }
     const {languageService, scriptInfo} = lsInfo;
     if (scriptInfo.scriptKind === ts.ScriptKind.TS) {
@@ -836,13 +836,13 @@ export class Session {
     }
     const project = this.getDefaultProjectForScriptInfo(scriptInfo);
     if (project === undefined || this.renameDisabledProjects.has(project)) {
-      return;
+      return null;
     }
 
     const offset = lspPositionToTsPosition(scriptInfo, params.position);
     const renameInfo = languageService.getRenameInfo(scriptInfo.fileName, offset);
     if (!renameInfo.canRename) {
-      return undefined;
+      return null;
     }
     const range = tsTextSpanToLspRange(scriptInfo, renameInfo.triggerSpan);
     return {
@@ -853,7 +853,7 @@ export class Session {
 
   private onReferences(params: lsp.TextDocumentPositionParams): lsp.Location[]|undefined {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -899,28 +899,28 @@ export class Session {
   }
 
   private getLSAndScriptInfo(textDocumentOrFileName: lsp.TextDocumentIdentifier|string):
-      {languageService: NgLanguageService, scriptInfo: ts.server.ScriptInfo}|undefined {
+      {languageService: NgLanguageService, scriptInfo: ts.server.ScriptInfo}|null {
     const filePath = lsp.TextDocumentIdentifier.is(textDocumentOrFileName) ?
         uriToFilePath(textDocumentOrFileName.uri) :
         textDocumentOrFileName;
     const scriptInfo = this.projectService.getScriptInfo(filePath);
     if (!scriptInfo) {
       this.error(`Script info not found for ${filePath}`);
-      return;
+      return null;
     }
 
     const project = this.getDefaultProjectForScriptInfo(scriptInfo);
     if (!project?.languageServiceEnabled) {
-      return;
+      return null;
     }
     if (project.isClosed()) {
       scriptInfo.detachFromProject(project);
       this.logger.info(`Failed to get language service for closed project ${project.projectName}.`);
-      return undefined;
+      return null;
     }
     const languageService = project.getLanguageService();
     if (!isNgLanguageService(languageService)) {
-      return undefined;
+      return null;
     }
     return {
       languageService,
@@ -930,7 +930,7 @@ export class Session {
 
   private onHover(params: lsp.TextDocumentPositionParams) {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -965,7 +965,7 @@ export class Session {
 
   private onCompletion(params: lsp.CompletionParams) {
     const lsInfo = this.getLSAndScriptInfo(params.textDocument);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -992,7 +992,7 @@ export class Session {
 
     const {filePath, position} = data;
     const lsInfo = this.getLSAndScriptInfo(filePath);
-    if (lsInfo === undefined) {
+    if (lsInfo === null) {
       return item;
     }
     const {languageService, scriptInfo} = lsInfo;
@@ -1068,25 +1068,25 @@ export class Session {
    *
    * @returns main declaration file in `@angular/core`.
    */
-  private findAngularCore(project: ts.server.Project): string|undefined {
+  private findAngularCore(project: ts.server.Project): string|null {
     const {projectName} = project;
     if (!project.languageServiceEnabled) {
       this.info(
           `Language service is already disabled for ${projectName}. ` +
           `This could be due to non-TS files that exceeded the size limit (${
               ts.server.maxProgramSizeForNonTsFiles} bytes).` +
           `Please check log file for details.`);
-      return;
+      return null;
     }
     if (!project.hasRoots() || project.isNonTsProject()) {
-      return undefined;
+      return null;
     }
     const angularCore = project.getFileNames().find(isAngularCore);
     if (angularCore === undefined && project.getExcludedFiles().some(isAngularCore)) {
       this.info(
           `Please check your tsconfig.json to make sure 'node_modules' directory is not excluded.`);
     }
-    return angularCore;
+    return angularCore ?? null;
   }
 
   /**