From bf99321408066051070a8ac5027be009aca99b41 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 3 May 2018 16:51:46 -0700
Subject: [PATCH] Pick up new TS insiders

---
 .../server/src/modes/javascriptMode.ts                     | 2 +-
 extensions/package.json                                    | 2 +-
 .../src/features/fileConfigurationManager.ts               | 7 ++-----
 .../src/features/quickFixProvider.ts                       | 6 +++---
 extensions/yarn.lock                                       | 6 +++---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 8cbbfce39c8..a612f45b750 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -109,7 +109,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		doResolve(document: TextDocument, item: CompletionItem): CompletionItem {
 			updateCurrentTextDocument(document);
-			let details = jsLanguageService.getCompletionEntryDetails(FILE_NAME, item.data.offset, item.label, undefined, undefined);
+			let details = jsLanguageService.getCompletionEntryDetails(FILE_NAME, item.data.offset, item.label, undefined, undefined, undefined);
 			if (details) {
 				item.detail = ts.displayPartsToString(details.displayParts);
 				item.documentation = ts.displayPartsToString(details.documentation);
diff --git a/extensions/package.json b/extensions/package.json
index d3693f49712..9ac07779d67 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.8.3"
+    "typescript": "2.9.0-insiders.20180503"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
index ae5f900a762..dcaffc8b2d2 100644
--- a/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
+++ b/extensions/typescript-language-features/src/features/fileConfigurationManager.ts
@@ -9,9 +9,6 @@ import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import * as languageIds from '../utils/languageModeIds';
 
-// TODO: for TS 2.8
-type UserPreferences = any;
-
 function objsAreEqual<T>(a: T, b: T): boolean {
 	let keys = Object.keys(a);
 	for (let i = 0; i < keys.length; i++) {
@@ -25,7 +22,7 @@ function objsAreEqual<T>(a: T, b: T): boolean {
 
 interface FileConfiguration {
 	formatOptions: Proto.FormatCodeSettings;
-	preferences: UserPreferences;
+	preferences: Proto.UserPreferences;
 }
 
 function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration): boolean {
@@ -146,7 +143,7 @@ export default class FileConfigurationManager {
 		};
 	}
 
-	private getPreferences(document: TextDocument): UserPreferences {
+	private getPreferences(document: TextDocument): Proto.UserPreferences {
 		if (!this.client.apiVersion.has290Features()) {
 			return {};
 		}
diff --git a/extensions/typescript-language-features/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFixProvider.ts
index 3d48f48cb98..e0c30313fb5 100644
--- a/extensions/typescript-language-features/src/features/quickFixProvider.ts
+++ b/extensions/typescript-language-features/src/features/quickFixProvider.ts
@@ -201,16 +201,16 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 		document: vscode.TextDocument,
 		file: string,
 		diagnostic: vscode.Diagnostic,
-		tsAction: Proto.CodeFixAction
+		tsAction: Proto.CodeAction
 	): Promise<Iterable<vscode.CodeAction>> {
 		const singleFix = this.getSingleFixForTsCodeAction(diagnostic, tsAction);
-		const fixAll = await this.getFixAllForTsCodeAction(document, file, diagnostic, tsAction);
+		const fixAll = await this.getFixAllForTsCodeAction(document, file, diagnostic, tsAction as Proto.CodeFixAction);
 		return fixAll ? [singleFix, fixAll] : [singleFix];
 	}
 
 	private getSingleFixForTsCodeAction(
 		diagnostic: vscode.Diagnostic,
-		tsAction: Proto.CodeFixAction
+		tsAction: Proto.CodeAction
 	): vscode.CodeAction {
 		const codeAction = new vscode.CodeAction(tsAction.description, vscode.CodeActionKind.QuickFix);
 		codeAction.edit = getEditForCodeAction(this.client, tsAction);
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 504d8abd96d..38a10312c1e 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.8.3:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
+typescript@2.9.0-insiders.20180503:
+  version "2.9.0-insiders.20180503"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-insiders.20180503.tgz#dc5363403e7b384ad85b1a74a96412c36ea238a4"
-- 
GitLab