feat(ls): hook-up hover added to @angular/language-service

Author: chuckjaz

server/src/documents.ts

@@ -113,7 +113,7 @@ function uriToFileName(uri: string): string {
 }
 
 const fileProtocol = "file://";
-function fileNameToUri(fileName: string): string {
+export function fileNameToUri(fileName: string): string {
   return encodeURI(fileProtocol + fileName);
 }
 
@@ -215,7 +215,10 @@ export class TextDocuments {
   public offsetsToPositions(document: TextDocumentIdentifier, offsets: number[]): Position[] {
     const file = uriToFileName(document.uri);
     if (file) {
-      return this.projectService.positionsToLineOffsets(file, offsets).map(lineOffset => Position.create(lineOffset.line - 1, lineOffset.col - 1));
+      const lineOffsets = this.projectService.positionsToLineOffsets(file, offsets)
+      if (lineOffsets) {
+        return lineOffsets.map(lineOffset => Position.create(lineOffset.line - 1, lineOffset.col - 1));
+      }
     }
     return [];
   }

server/src/editorServices.ts

@@ -1677,31 +1677,38 @@ export class ProjectService {
       this.report("change", file, project);
   }
 
-  /**
-   *
-   */
-  lineOffsetsToPositions(fileName: string, positions: {line: number, col: number}[]): number[] {
-      const file = normalizePath(fileName);
-      const project = this.getProjectForFile(file);
-      if (project && !project.languageServiceDiabled) {
-          const compilerService = project.compilerService;
-          return positions.map(position => compilerService.host.lineOffsetToPosition(file, position.line, position.col));
+  forcedGetProjectForFile(fileName: string): Project {
+    const file = normalizePath(fileName);
+    const info = this.filenameToScriptInfo[file];
+    if (info) {
+      let project = info.defaultProject;
+      if (!project) {
+        // Force the association of the info with a default project.
+        this.findReferencingProjects(info);
+        project = info.defaultProject;
       }
-      return undefined;
+      return project;
+    }
+  }
+
+  lineOffsetsToPositions(fileName: string, positions: {line: number, col: number}[]): number[] {
+    const project = this.forcedGetProjectForFile(fileName);
+    if (project && !project.languageServiceDiabled) {
+        const compilerService = project.compilerService;
+        return positions.map(position => compilerService.host.lineOffsetToPosition(fileName, position.line, position.col));
+    }
   }
 
   positionsToLineOffsets(fileName: string, offsets: number[]): {line: number, col: number}[] {
-      const file = normalizePath(fileName);
-      const project = this.getProjectForFile(file);
+      const project = this.forcedGetProjectForFile(fileName);
       if (project && !project.languageServiceDiabled) {
           const compilerService = project.compilerService;
           return offsets.map(offset => compilerService.host.positionToLineOffset(fileName, offset)).map(pos => ({line: pos.line, col: pos.offset}));
       }
   }
 
   positionToLineOffset(fileName: string, offset: number) {
-      const file = normalizePath(fileName);
-      const project = this.getProjectForFile(file);
+      const project = this.forcedGetProjectForFile(fileName);
       if (project && !project.languageServiceDiabled) {
           const compilerService = project.compilerService;
           return compilerService.host.positionToLineOffset(fileName, offset);
@@ -3037,7 +3044,6 @@ export class LineLeaf implements LineCollection {
   }
 }
 
-
 function logServiceTimes(logger: Logger, service: ng.LanguageService): ng.LanguageService {
   function time<T>(name: string, cb: () => T): T {
     const start = Date.now();
@@ -3055,6 +3061,12 @@ function logServiceTimes(logger: Logger, service: ng.LanguageService): ng.Langua
     getTemplateReferences() {
       return time("getTemplateRefrences", () => service.getTemplateReferences());
     },
+    getDefinitionAt(fileName, position) {
+        return time("getDefinitionAt", () => service.getDefinitionAt(fileName, position));
+    },
+    getHoverAt(fileName, position) {
+        return time("getHoverAt", () => service.getHoverAt(fileName, position));
+    },
     getPipesAt(fileName, position) {
       return service.getPipesAt(fileName, position);
     }

server/src/server.ts

@@ -7,17 +7,19 @@
 /// <reference path="../typings/promise.d.ts" />
 /// <reference path="../node_modules/@types/node/index.d.ts" />
 
+import * as ng from '@angular/language-service';
+
 import 'reflect-metadata';
 import {
   IPCMessageReader, IPCMessageWriter,
   createConnection, IConnection, TextDocumentSyncKind,
   TextDocument, Diagnostic, DiagnosticSeverity,
   InitializeParams, InitializeResult, TextDocumentPositionParams,
-  CompletionItem, CompletionItemKind, Definition, TextDocumentIdentifier,
-  Position, Range, TextEdit
+  CompletionItem, CompletionItemKind, Definition, Location, TextDocumentIdentifier,
+  Position, Range, TextEdit, Hover
 } from 'vscode-languageserver';
 
-import {TextDocuments, TextDocumentEvent} from './documents';
+import {TextDocuments, TextDocumentEvent, fileNameToUri} from './documents';
 import {ErrorCollector} from './errors';
 
 import {Completion, Span} from '@angular/language-service';
@@ -60,7 +62,9 @@ connection.onInitialize((params): InitializeResult => {
       completionProvider: {
         resolveProvider: false,
         triggerCharacters: ['<', '.', '*', '[', '(']
-      }
+      },
+      definitionProvider: true,
+      hoverProvider: true
     }
   }
 });
@@ -93,7 +97,6 @@ function insertionToEdit(range: Range, insertText: string): TextEdit {
   }
 }
 
-
 function getReplaceRange(document: TextDocumentIdentifier, offset: number): Range {
   const line = documents.getDocumentLine(document, offset);
   if (line && line.text && line.start <= offset && line.start + line.text.length >= offset) {
@@ -146,5 +149,54 @@ connection.onCompletion((textDocumentPosition: TextDocumentPositionParams): Comp
   }
 });
 
+function ngDefintionToDefintion(definition: ng.Definition): Definition {
+  const locations = definition.map(d => {
+    const document = TextDocumentIdentifier.create(fileNameToUri(d.fileName));
+    const positions = documents.offsetsToPositions(document, [d.span.start, d.span.end]);
+    return {document, positions}
+  }).filter(d => d.positions.length > 0).map(d => {
+    const range = Range.create(d.positions[0], d.positions[1]);
+    return Location.create(d.document.uri, range);
+  });
+  if (locations && locations.length) {
+    return locations;
+  }
+}
+
+connection.onDefinition((textDocumentPosition: TextDocumentPositionParams): Definition => {
+  const {fileName, service, offset, languageId} = documents.getServiceInfo(textDocumentPosition.textDocument,
+    textDocumentPosition.position)
+  if (fileName && service && offset != null) {
+    let result = service.getDefinitionAt(fileName, offset);
+    if (result) {
+      return ngDefintionToDefintion(result);
+    }
+  }
+});
+
+function ngHoverToHover(hover: ng.Hover, document: TextDocumentIdentifier): Hover {
+  if (hover) {
+    const positions = documents.offsetsToPositions(document, [hover.span.start, hover.span.end]);
+    if (positions) {
+      const range = Range.create(positions[0], positions[1]);
+      return {
+        contents: {language: 'typescript', value: hover.text.map(t => t.text).join('')},
+        range
+      };
+    }
+  }
+}
+
+connection.onHover((textDocumentPosition: TextDocumentPositionParams): Hover => {
+  const {fileName, service, offset, languageId} = documents.getServiceInfo(textDocumentPosition.textDocument,
+    textDocumentPosition.position)
+  if (fileName && service && offset != null) {
+    let result = service.getHoverAt(fileName, offset);
+    if (result) {
+      return ngHoverToHover(result, textDocumentPosition.textDocument);
+    }
+  }
+});
+
 // Listen on the connection
 connection.listen();