From 3cb1c82e754faa54b6ca1599b7b8720c2520dc4a Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Mon, 9 Nov 2020 14:11:02 -0800
Subject: [PATCH] fix: LS not showing existing diagnotics on file open

This commit fixes a bug whereby existing diagnostics in an external template
are not shown when the file is opened the first time. Diagnostics only show
up when subsequent edits are made to the file.
This is a regression after upgrading to TS 4.0

Fix https://github.com/angular/vscode-ng-language-service/issues/922
---
 integration/lsp/viewengine_spec.ts | 19 +++++++++++++++++++
 server/src/session.ts              | 18 +++++++-----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/integration/lsp/viewengine_spec.ts b/integration/lsp/viewengine_spec.ts
index 30042b37cd..d84346d866 100644
--- a/integration/lsp/viewengine_spec.ts
+++ b/integration/lsp/viewengine_spec.ts
@@ -86,6 +86,25 @@ describe('Angular language server', () => {
       },
     });
   });
+
+  it('should show existing diagnostics on external template', async () => {
+    client.sendNotification(lsp.DidOpenTextDocumentNotification.type, {
+      textDocument: {
+        uri: `file://${FOO_TEMPLATE}`,
+        languageId: 'typescript',
+        version: 1,
+        text: `{{ doesnotexist }}`,
+      },
+    });
+    const diagnostics: lsp.Diagnostic[] = await new Promise(resolve => {
+      client.onNotification(
+          lsp.PublishDiagnosticsNotification.type, (params: lsp.PublishDiagnosticsParams) => {
+            resolve(params.diagnostics);
+          });
+    });
+    expect(diagnostics.length).toBe(1);
+    expect(diagnostics[0].message).toContain(`Identifier 'doesnotexist' is not defined.`);
+  });
 });
 
 describe('initialization', () => {
diff --git a/server/src/session.ts b/server/src/session.ts
index 7200eee9d7..6b2e747ddd 100644
--- a/server/src/session.ts
+++ b/server/src/session.ts
@@ -272,17 +272,9 @@ export class Session {
         // configFileErrors is an empty array even if there's no error, so check length.
         this.connection.console.error(configFileErrors.map(e => e.messageText).join('\n'));
       }
-      if (!configFileName) {
-        // It is not really an error if there is no config file, because the
-        // first call to openClientFile() will create a project for the file if
-        // it does not exist, but the method will not return the config filename.
-        // In subsequent operations, we'll call this.getDefaultProjectForScriptInfo(),
-        // and there we make a second call to openClientFile(). By then, since
-        // the project has already been created, we will receive the config
-        // filename, and we can attach the file to the project it belongs to.
-        return;
-      }
-      const project = this.projectService.findProject(configFileName);
+      const project = configFileName ?
+          this.projectService.findProject(configFileName) :
+          this.projectService.getScriptInfo(filePath)?.containingProjects.find(isConfiguredProject);
       if (!project) {
         this.connection.console.error(`Failed to find project for ${filePath}`);
         return;
@@ -577,3 +569,7 @@ function isAngularProject(project: ts.server.Project, ngCore: string): boolean {
   }
   return false;
 }
+
+function isConfiguredProject(project: ts.server.Project): project is ts.server.ConfiguredProject {
+  return project.projectKind === ts.server.ProjectKind.Configured;
+}