fix(ls): move to the latest langauge service package format

Author: chuckjaz

client/src/extension.ts

@@ -9,7 +9,7 @@ export function activate(context: ExtensionContext) {
   // The server is implemented in node
   let serverModule = context.asAbsolutePath(path.join('server', 'server.js'));
   // The debug options for the server
-  let debugOptions = { execArgv: ["--nolazy", "--debug-brk=6004"] };
+  let debugOptions = { execArgv: ["--nolazy", "--debug=6004"] };
 
   // If the extension is launched in debug mode then the debug server options are used
   // Otherwise the run options are used

server/package.json

@@ -12,15 +12,15 @@
     "watch": "installServerIntoExtension ../client ./package.json ./tsconfig.json && tsc --watch -p ."
   },
   "dependencies": {
-    "@angular/language-service": "file:///Users/chuckj/src/angular/dist/packages-dist/language-service",
-    "@angular/tsc-wrapped": "file:///Users/chuckj/src/angular/dist/tools/@angular/tsc-wrapped",
     "reflect-metadata": "^0.1.8",
-    "rxjs": "^5.0.0-beta.12",
     "typescript": "2.0.2",
     "vscode-languageserver": "^2.4.0-next.9",
-    "zone.js": "^0.6.25"
+    "@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",

server/src/editorServices.ts

@@ -2015,20 +2015,25 @@ export class CompilerService {
   resolveLanguageServiceModule(): typeof ng {
       const host = path.resolve(this.host.getCurrentDirectory(), 'main.ts');
       const modules = this.host.resolveModuleNames(['@angular/language-service'], host);
+      let result = ng;
       if (modules && modules[0]) {
         const resolvedModule = modules[0];
         const moduleName = path.dirname(resolvedModule.resolvedFileName);
         if (fs.existsSync(moduleName)) {
             try {
-                const result: typeof ng = require(moduleName);
-                if (result) return result;
+                result = require(moduleName) || result;
             } catch(e) {
                 this.log(`Error loading module "${moduleName}"; using local language service instead`);
                 this.log(e.stack);
             }
         }
       }
-      return ng;
+      if (typeof result === 'function') {
+          // The language service bundle exposes a function to allow hooking module dependencies
+          // such as TypeScript. However, using require() here is sufficient for us.
+          result = result();
+      }
+      return result;
   }
 
   private log(message: string) {