From d9cbd11d0099c6179ac56ddd09f3b727b00006b6 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 18 Aug 2017 16:48:51 -0700
Subject: [PATCH] Pick up TS 2.5.1 insiders

---
 extensions/npm-shrinkwrap.json                              | 6 +++---
 extensions/package.json                                     | 2 +-
 .../typescript/src/features/completionItemProvider.ts       | 2 +-
 .../typescript/src/features/documentSymbolProvider.ts       | 4 ++--
 extensions/typescript/src/typescriptServiceClient.ts        | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/npm-shrinkwrap.json b/extensions/npm-shrinkwrap.json
index 4ffcfc354c6..149c711b4e7 100644
--- a/extensions/npm-shrinkwrap.json
+++ b/extensions/npm-shrinkwrap.json
@@ -3,9 +3,9 @@
   "version": "0.0.1",
   "dependencies": {
     "typescript": {
-      "version": "2.4.2",
-      "from": "typescript@2.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"
+      "version": "2.5.1-insiders.20170818",
+      "from": "typescript@2.5.1-insiders.20170818",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.1-insiders.20170818.tgz"
     }
   }
 }
diff --git a/extensions/package.json b/extensions/package.json
index 834e7ca2131..102d1ef27d5 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.4.2"
+    "typescript": "2.5.1-insiders.20170818"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index 90a3f56b30e..db06b46cbc2 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -278,7 +278,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 		// Don't complete function calls inside of destructive assigments or imports
 		return this.client.execute('quickinfo', args).then(infoResponse => {
 			const info = infoResponse.body;
-			switch (info && info.kind) {
+			switch (info && info.kind as string) {
 				case 'var':
 				case 'let':
 				case 'const':
diff --git a/extensions/typescript/src/features/documentSymbolProvider.ts b/extensions/typescript/src/features/documentSymbolProvider.ts
index 9fbaf64fc80..456776cf3a6 100644
--- a/extensions/typescript/src/features/documentSymbolProvider.ts
+++ b/extensions/typescript/src/features/documentSymbolProvider.ts
@@ -71,7 +71,7 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
 		let key = `${realIndent}|${item.text}`;
 		if (realIndent !== 0 && !foldingMap[key] && TypeScriptDocumentSymbolProvider.shouldInclueEntry(item.text)) {
 			let result = new SymbolInformation(item.text,
-				outlineTypeTable[item.kind] || SymbolKind.Variable,
+				outlineTypeTable[item.kind as string] || SymbolKind.Variable,
 				containerLabel ? containerLabel : '',
 				new Location(resource, textSpan2Range(item.spans[0])));
 			foldingMap[key] = result;
@@ -86,7 +86,7 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
 
 	private static convertNavTree(resource: Uri, bucket: SymbolInformation[], item: Proto.NavigationTree, containerLabel?: string): void {
 		const result = new SymbolInformation(item.text,
-			outlineTypeTable[item.kind] || SymbolKind.Variable,
+			outlineTypeTable[item.kind as string] || SymbolKind.Variable,
 			containerLabel ? containerLabel : '',
 			new Location(resource, textSpan2Range(item.spans[0]))
 		);
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index 24e38eb8db6..091abda60d1 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -501,12 +501,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		}
 
 		const compilerOptions: Proto.ExternalProjectCompilerOptions = {
-			module: 'CommonJS',
-			target: 'ES6',
+			module: Proto.ModuleKind.CommonJS,
+			target: Proto.ScriptTarget.ES6,
 			allowSyntheticDefaultImports: true,
 			allowNonTsExtensions: true,
 			allowJs: true,
-			jsx: 'Preserve'
+			jsx: Proto.JsxEmit.Preserve
 		};
 
 		if (this.apiVersion.has230Features()) {