Merge branch 'master' into pr/mattmccutchen/21

package-lock.json

@@ -168,7 +168,15 @@
       "integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==",
       "dev": true,
       "requires": {
-        "typescript": "2.8.1"
+        "typescript": "2.9.2"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+          "dev": true
+        }
       }
     },
     "ms": {
@@ -214,25 +222,25 @@
       }
     },
     "typescript": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz",
-      "integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
+      "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.3.14",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz",
-      "integrity": "sha512-OY8VPQU25q09gQRbC+Ekk3xgEVBmYFEfVcgS47ksjTiNht2LmLlUkWutyi38ZsDSToJHwbe76kDGwmD226Z2Fg==",
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz",
+      "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==",
       "dev": true,
       "requires": {
-        "commander": "2.14.1",
+        "commander": "2.16.0",
         "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
           "dev": true
         }
       }

package.json

@@ -25,7 +25,7 @@
     "monaco-editor-core": "0.12.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.5",
-    "typescript": "2.8.1",
-    "uglify-js": "^3.3.14"
+    "typescript": "3.0.1",
+    "uglify-js": "^3.4.6"
   }
 }

scripts/importTypescript.js

@@ -67,9 +67,8 @@ export = ts;
  */
 function importLibDeclarationFile(name) {
 	var dstName = name.replace(/\.d\.ts$/, '').replace(/\./g, '-') + '-ts';
-	var srcPath = path.join(TYPESCRIPT_LIB_SOURCE, name);
 
-	var contents = fs.readFileSync(srcPath).toString();
+	var contents = resolveLibFile(null, name);
 
 	var dstPath = path.join(TYPESCRIPT_LIB_DESTINATION, dstName + '.ts');
 	fs.writeFileSync(dstPath,
@@ -82,6 +81,29 @@ export const contents = "${escapeText(contents)}";
 `);
 }
 
+function resolveLibFile(name, filename) {
+	var srcPath;
+	if (filename) {
+		srcPath = path.join(TYPESCRIPT_LIB_SOURCE, filename);
+	} else {
+		srcPath = path.join(TYPESCRIPT_LIB_SOURCE, `lib.${name}.d.ts`);
+	}
+
+	var contents = fs.readFileSync(srcPath).toString();
+	var lines = contents.split(/\r\n|\r|\n/);
+	var result = [];
+	for (let i = 0; i < lines.length; i++) {
+		let m = lines[i].match(/\/\/\/\s*<reference\s*lib="([^"]+)"/);
+		if (m) {
+			result.push('\n' + resolveLibFile(m[1], null) + '\n');
+			continue;
+		}
+		result.push(lines[i]);
+	}
+
+	return result.join('\n');
+}
+
 /**
  * Escape text such that it can be used in a javascript string enclosed by double quotes (")
  */

src/tsWorker.ts

@@ -157,11 +157,11 @@ export class TypeScriptWorker implements ts.LanguageServiceHost {
 	}
 
 	getCompletionEntryDetails(fileName: string, position: number, entry: string): Promise<ts.CompletionEntryDetails> {
-		return Promise.as(this._languageService.getCompletionEntryDetails(fileName, position, entry, undefined, undefined));
+		return Promise.as(this._languageService.getCompletionEntryDetails(fileName, position, entry, undefined, undefined, undefined));
 	}
 
 	getSignatureHelpItems(fileName: string, position: number): Promise<ts.SignatureHelpItems> {
-		return Promise.as(this._languageService.getSignatureHelpItems(fileName, position));
+		return Promise.as(this._languageService.getSignatureHelpItems(fileName, position, undefined));
 	}
 
 	getQuickInfoAtPosition(fileName: string, position: number): Promise<ts.QuickInfo> {