fix(ls): improve performance of service

fix: implement getProjectVersion() for LSHost
fix: add reponse timing to logging

Author: chuckjaz

client/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ng-template",
-  "displayName": "Angular Template",
-  "description": "Angular Template Service",
-  "version": "0.0.5",
+  "displayName": "Angular Langauge Service",
+  "description": "Editor services for Angular templates",
+  "version": "0.0.7",
   "publisher": "Google",
   "engines": {
     "vscode": "^1.4.0"

server/package.json

@@ -18,12 +18,12 @@
     "@angular/language-service": "file:///Users/chuckj/src/angular/dist/packages-dist/language-service"
   },
   "devDependencies": {
-    "rxjs": "^5.0.0-beta.12",
-    "zone.js": "^0.6.25",
-    "@angular/tsc-wrapped": "file:///Users/chuckj/src/angular/dist/tools/@angular/tsc-wrapped",
     "@angular/compiler": "file:///Users/chuckj/src/angular/dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:///Users/chuckj/src/angular/dist/packages-dist/compiler-cli",
     "@angular/core": "file:///Users/chuckj/src/angular/dist/packages-dist/core",
-    "@types/node": "^6.0.40"
+    "@angular/tsc-wrapped": "file:///Users/chuckj/src/angular/dist/tools/@angular/tsc-wrapped",
+    "@types/node": "^6.0.46",
+    "rxjs": "^5.0.0-beta.12",
+    "zone.js": "^0.6.25"
   }
 }

server/src/editorServices.ts

@@ -502,6 +502,7 @@ export class LSHost implements ts.LanguageServiceHost {
   compilationSettings: ts.CompilerOptions;
   filenameToScript: Map<ts.Path, ScriptInfo>;
   roots: ScriptInfo[] = [];
+  version: number = 0;
 
   private resolvedModuleNames: Map<ts.Path, ts.Map<TimestampedResolvedModule>>;
   private resolvedTypeReferenceDirectives: Map<ts.Path, ts.Map<TimestampedResolvedTypeReferenceDirective>>;
@@ -577,6 +578,10 @@ export class LSHost implements ts.LanguageServiceHost {
       }
   }
 
+  getProjectVersion() {
+      return this.version.toString();
+  }
+
   resolveTypeReferenceDirectives(typeDirectiveNames: string[], containingFile: string): ts.ResolvedTypeReferenceDirective[] {
       return this.resolveNamesWithLocalCache(typeDirectiveNames, containingFile, this.resolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, m => m.resolvedTypeReferenceDirective);
   }
@@ -602,6 +607,7 @@ export class LSHost implements ts.LanguageServiceHost {
       // conservatively assume that changing compiler options might affect module resolution strategy
       this.resolvedModuleNames.clear();
       this.resolvedTypeReferenceDirectives.clear();
+      this.modified();
   }
 
   lineAffectsRefs(filename: string, line: number) {
@@ -651,6 +657,7 @@ export class LSHost implements ts.LanguageServiceHost {
           this.filenameToScript.delete(info.path);
           this.resolvedModuleNames.delete(info.path);
           this.resolvedTypeReferenceDirectives.delete(info.path);
+          this.modified();
       }
   }
 
@@ -670,6 +677,7 @@ export class LSHost implements ts.LanguageServiceHost {
       if (!this.filenameToScript.has(info.path)) {
           this.filenameToScript.set(info.path, info);
           this.roots.push(info);
+          this.modified();
       }
   }
 
@@ -679,6 +687,7 @@ export class LSHost implements ts.LanguageServiceHost {
           this.roots = copyListRemovingItem(info, this.roots);
           this.resolvedModuleNames.delete(info.path);
           this.resolvedTypeReferenceDirectives.delete(info.path);
+          this.modified();
       }
   }
 
@@ -694,13 +703,15 @@ export class LSHost implements ts.LanguageServiceHost {
       const script = this.getScriptInfo(filename);
       if (script) {
           script.svc.reloadFromFile(tmpfilename, cb);
+          this.modified();
       }
   }
 
   editScript(filename: string, start: number, end: number, newText: string) {
       const script = this.getScriptInfo(filename);
       if (script) {
           script.editContent(start, end, newText);
+          this.modified();
           return;
       }
 
@@ -774,6 +785,10 @@ export class LSHost implements ts.LanguageServiceHost {
       const script: ScriptInfo = this.filenameToScript.get(path);
       return script.snap().index;
   }
+
+  private modified() {
+      this.version++;
+  }
 }
 
 export interface ProjectOptions {
@@ -1544,12 +1559,14 @@ export class ProjectService {
       }
 
       // Update Angular summaries
+      let start = Date.now();
       for (let project of this.configuredProjects) {
           project.compilerService.ngHost.updateModuleSummary();
       }
       for (let project of this.inferredProjects) {
           project.compilerService.ngHost.updateModuleSummary();
       }
+      this.log(`updated: ng - ${Date.now() - start}ms`, "Info");
 
       this.printProjects();
   }
@@ -1997,7 +2014,7 @@ export class CompilerService {
 
       this.ng = this.resolveLanguageServiceModule();
       this.ngHost = new this.ng.TypeScriptServiceHost(ts, this.host, this.languageService);
-      this.ngService = this.ng.createLanguageService(this.ngHost);
+      this.ngService = logServiceTimes(logger, this.ng.createLanguageService(this.ngHost));
       this.ngHost.setSite(this.ngService);
       this.classifier = ts.createClassifier();
   }
@@ -3006,3 +3023,27 @@ export class LineLeaf implements LineCollection {
       return 1;
   }
 }
+
+
+function logServiceTimes(logger: Logger, service: ng.LanguageService): ng.LanguageService {
+  function time<T>(name: string, cb: () => T): T {
+    const start = Date.now();
+    const result = cb();
+    logger.msg(`${name}: ${Date.now() - start}ms`);
+    return result;
+  }
+  return {
+    getCompletionsAt(fileName, position) {
+      return time("getCompletions", () => service.getCompletionsAt(fileName, position));
+    },
+    getDiagnostics(fileName) {
+      return time("getDiagnnostics", () => service.getDiagnostics(fileName));
+    },
+    getTemplateReferences() {
+      return time("getTemplateRefrences", () => service.getTemplateReferences());
+    },
+    getPipesAt(fileName, position) {
+      return service.getPipesAt(fileName, position);
+    }
+  };
+}

server/src/server.ts

@@ -20,7 +20,7 @@ import {TextDocuments, TextDocumentEvent} from './documents';
 import {ErrorCollector} from './errors';
 
 // Create a connection for the server. The connection uses Node's IPC as a transport
-let connection: IConnection = createConnection(new IPCMessageReader(process), new IPCMessageWriter(process));
+let connection: IConnection = createConnection();
 
 // Create a simple text document manager. The text document manager
 // supports full document sync only