feat: Backwards compat with new TS LS interface

angular/angular#32115 updates the interface
for ng.getDiagnostics() to return ts.Diagnostics[] whereas
angular/angular#32115 updates the interface
for ng.getCompletions() to return ts.CompletionInfo.

This PR makes the extension backwards compatible with the older
interface.

Author: kyliau

server/src/editorServices.ts

@@ -1528,11 +1528,23 @@ export class ProjectService {
 
       // Update Angular summaries
       let start = Date.now();
-      for (let project of this.configuredProjects) {
-          project.compilerService.ngHost.updateAnalyzedModules();
-      }
-      for (let project of this.inferredProjects) {
-          project.compilerService.ngHost.updateAnalyzedModules();
+      for (const project of this.configuredProjects) {
+          const ngHost = project.compilerService.ngHost;
+          if (ngHost.updateAnalyzedModules) {
+              // For backwards compatibility
+              ngHost.updateAnalyzedModules();
+          } else {
+              ngHost.getAnalyzedModules();
+          }
+      }
+      for (const project of this.inferredProjects) {
+          const ngHost = project.compilerService.ngHost;
+          if (ngHost.updateAnalyzedModules) {
+              // For backwards compatibility
+              ngHost.updateAnalyzedModules();
+          } else {
+              ngHost.getAnalyzedModules();
+          }
       }
       this.log(`updated: ng - ${Date.now() - start}ms`, "Info");
 

server/src/errors.ts

@@ -1,6 +1,7 @@
 import {DiagnosticSeverity, IConnection, Range, TextDocumentIdentifier} from 'vscode-languageserver';
 import {TextDocuments} from './documents';
 import {DiagnosticMessageChain} from '@angular/language-service/src/types';
+import * as ts from 'typescript';
 
 export class ErrorCollector {
   private timer: NodeJS.Timer | undefined;
@@ -31,7 +32,11 @@ export class ErrorCollector {
     const {fileName, service} = this.documents.getServiceInfo(document);
     if (service) {
       const diagnostics = service.getDiagnostics(fileName);
-      if (diagnostics) {
+      if (!diagnostics || !diagnostics.length) {
+        return;
+      }
+      if (diagnostics[0].message) {
+        // Backwards compatibility with old ng.Diagnostic[]
         const offsets = ([] as number[]).concat(...diagnostics.map(d => [d.span.start, d.span.end]));
         const positions = this.documents.offsetsToPositions(document, offsets);
         const ranges: Range[] = [];
@@ -48,6 +53,28 @@ export class ErrorCollector {
           }))
         });
       }
+      else {
+        const tsDiagnostics = diagnostics as unknown as ts.Diagnostic[];
+        const offsets = ([] as number[]).concat(...tsDiagnostics.map(d => {
+          const start = d.start || 0;
+          const end = start + (d.length || 0);
+          return [start, end];
+        }));
+        const positions = this.documents.offsetsToPositions(document, offsets);
+        const ranges: Range[] = [];
+        for (let i = 0; i < positions.length; i += 2) {
+          ranges.push(Range.create(positions[i], positions[i+1]));
+        }
+        this.connection.sendDiagnostics({
+          uri: document.uri,
+          diagnostics: tsDiagnostics.map((diagnostic, i) => ({
+            range: ranges[i],
+            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+            severity: DiagnosticSeverity.Error,
+            source: 'Angular'
+          }))
+        });
+      }
     }
   }
 }

server/src/server.ts

@@ -116,17 +116,20 @@ function insertTextOf(completion: Completion): string {
 }
 
 // This handler provides the initial list of the completion items.
-connection.onCompletion((textDocumentPosition: lsp.TextDocumentPositionParams): lsp.CompletionItem[] => {
-  const {fileName, service, offset, languageId} = documents.getServiceInfo(textDocumentPosition.textDocument,
-    textDocumentPosition.position)
+connection.onCompletion((params: lsp.TextDocumentPositionParams): lsp.CompletionItem[] => {
+  const {position, textDocument} = params;
+  const {fileName, service, offset, languageId} = documents.getServiceInfo(textDocument, position);
   if (fileName && service && offset != null) {
     let result = service.getCompletionsAt(fileName, offset);
-    if (result && languageId == 'html') {
-      // The HTML elements are provided by the HTML service when the text type is 'html'.
-      result = result.filter(completion => completion.kind != 'element');
+    if (!result) {
+      return;
     }
-    if (result) {
-      const replaceRange = getReplaceRange(textDocumentPosition.textDocument, offset);
+    if (Array.isArray(result)) {  // old ng.Completion[]
+      if (languageId == 'html') {
+        // The HTML elements are provided by the HTML service when the text type is 'html'.
+        result = result.filter(completion => completion.kind != 'element');
+      }
+      const replaceRange = getReplaceRange(params.textDocument, offset);
       return result.map(completion => ({
         label: completion.name,
         kind: compiletionKindToCompletionItemKind(completion.kind),
@@ -136,6 +139,15 @@ connection.onCompletion((textDocumentPosition: lsp.TextDocumentPositionParams):
         insertText: insertTextOf(completion)
       }));
     }
+    const entries = (result as ts.CompletionInfo).entries;
+    return entries.map(entry => {
+      const item = lsp.CompletionItem.create(entry.name);
+      item.kind = compiletionKindToCompletionItemKind(entry.kind);
+      item.detail = entry.kind;
+      item.sortText = entry.sortText;
+      item.textEdit = lsp.TextEdit.insert(position, entry.name);
+      return item;
+    });
   }
 });