Pick up latest TS for building VS code (microsoft#180706)

Author: mjbvz

build/lib/i18n.js

@@ -149,14 +149,14 @@ class MoveToFileRefactorCommand implements Command {
 			return;
 		}
 
-		const fileSuggestionArgs: Proto.GetEditsForMoveToFileRefactorRequestArgs = {
+		const fileSuggestionArgs: Proto.GetEditsForRefactorRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, args.range),
-			filepath: targetFile,
 			action: 'Move to file',
 			refactor: 'Move to file',
+			interactiveRefactorArguments: { targetFile },
 		};
 
-		const response = await this.client.execute('getEditsForMoveToFileRefactor', fileSuggestionArgs, nulToken);
+		const response = await this.client.execute('getEditsForRefactor', fileSuggestionArgs, nulToken);
 		if (response.type !== 'response' || !response.body) {
 			return;
 		}
@@ -175,16 +175,18 @@ class MoveToFileRefactorCommand implements Command {
 		if (response.type !== 'response' || !response.body) {
 			return;
 		}
+		const defaultUri = vscode.Uri.joinPath(Utils.dirname(document.uri), response.body.newFileName);
 
-		const selectFileItem: vscode.QuickPickItem = {
-			label: vscode.l10n.t("Select file..."),
-			detail: vscode.l10n.t("Select file or enter new file path..."),
+		const selectExistingFileItem: vscode.QuickPickItem = {
+			label: vscode.l10n.t("Select existing file..."),
+		};
+		const selectNewFileItem: vscode.QuickPickItem = {
+			label: vscode.l10n.t("Enter new file path..."),
 		};
 
-		type DestinationItem = vscode.QuickPickItem & { file: string };
+		type DestinationItem = vscode.QuickPickItem & { readonly file: string };
 
 		const workspaceFolder = vscode.workspace.getWorkspaceFolder(document.uri);
-
 		const destinationItems = response.body.files.map((file): DestinationItem => {
 			const uri = this.client.toResource(file);
 			const parentDir = Utils.dirname(uri);
@@ -208,7 +210,8 @@ class MoveToFileRefactorCommand implements Command {
 		});
 
 		const picked = await vscode.window.showQuickPick([
-			selectFileItem,
+			selectExistingFileItem,
+			selectNewFileItem,
 			{ label: vscode.l10n.t("Destination Files"), kind: vscode.QuickPickItemKind.Separator },
 			...destinationItems
 		], {
@@ -219,16 +222,23 @@ class MoveToFileRefactorCommand implements Command {
 			return;
 		}
 
-		if (picked === selectFileItem) {
+		if (picked === selectExistingFileItem) {
+			const picked = await vscode.window.showOpenDialog({
+				title: vscode.l10n.t("Select move destination"),
+				openLabel: vscode.l10n.t("Move to File"),
+				defaultUri
+			});
+			return picked?.length ? this.client.toTsFilePath(picked[0]) : undefined;
+		} else if (picked === selectNewFileItem) {
 			const picked = await vscode.window.showSaveDialog({
 				title: vscode.l10n.t("Select move destination"),
 				saveLabel: vscode.l10n.t("Move to File"),
-				defaultUri: vscode.Uri.joinPath(Utils.dirname(document.uri), response.body.newFilename)
+				defaultUri,
 			});
 			return picked ? this.client.toTsFilePath(picked) : undefined;
+		} else {
+			return (picked as DestinationItem).file;
 		}
-
-		return (picked as DestinationItem).file;
 	}
 }
 
@@ -467,10 +477,11 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider<TsCodeActi
 			}
 			this.formattingOptionsManager.ensureConfigurationForDocument(document, token);
 
-			const args: Proto.GetApplicableRefactorsRequestArgs & { kind?: string } = {
+			const args: Proto.GetApplicableRefactorsRequestArgs = {
 				...typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection),
 				triggerReason: this.toTsTriggerReason(context),
-				kind: context.only?.value
+				kind: context.only?.value,
+				includeInteractiveActions: true,
 			};
 			return this.client.execute('getApplicableRefactors', args, token);
 		});

build/lib/treeshaking.js

@@ -20,38 +20,6 @@ declare module 'typescript/lib/tsserverlibrary' {
 			readonly _serverType?: ServerType;
 		}
 
-		interface GetMoveToRefactoringFileSuggestionsRequest extends Request {
-			command: 'getMoveToRefactoringFileSuggestions';
-			arguments: GetMoveToRefactoringFileSuggestionsRequestArgs;
-		}
-
-		type GetMoveToRefactoringFileSuggestionsRequestArgs = FileLocationOrRangeRequestArgs & {
-			triggerReason?: RefactorTriggerReason;
-			kind?: string;
-		};
-
-		interface GetMoveToRefactoringFileSuggestionsResponse extends Response {
-			body?: {
-				newFilename: string;
-				files: string[];
-			};
-		}
-
-		interface GetEditsForMoveToFileRefactorRequest extends Request {
-			command: 'getEditsForMoveToFileRefactor';
-			arguments: GetEditsForMoveToFileRefactorRequestArgs;
-		}
-
-		interface GetEditsForMoveToFileRefactorResponse extends Response {
-			body?: RefactorEditInfo;
-		}
-
-		type GetEditsForMoveToFileRefactorRequestArgs = FileLocationOrRangeRequestArgs & {
-			refactor: string;
-			action: string;
-			filepath: string;
-		};
-
 		interface LinkedEditingRangesBody {
 			ranges: TextSpan[];
 			wordPattern?: string;

build/lib/tsb/builder.js

@@ -74,8 +74,7 @@ interface StandardTsServerRequests {
 	'provideInlayHints': [Proto.InlayHintsRequestArgs, Proto.InlayHintsResponse];
 	'encodedSemanticClassifications-full': [Proto.EncodedSemanticClassificationsRequestArgs, Proto.EncodedSemanticClassificationsResponse];
 	'findSourceDefinition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse];
-	'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestionsResponse];
-	'getEditsForMoveToFileRefactor': [Proto.GetEditsForMoveToFileRefactorRequestArgs, Proto.GetEditsForMoveToFileRefactorResponse];
+	'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestions];
 	'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse];
 }
 

build/lib/tsb/transpiler.js

@@ -203,7 +203,7 @@
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsec": "0.1.4",
-    "typescript": "^5.1.0-dev.20230417",
+    "typescript": "^5.1.0-dev.20230424",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.12.1",
     "util": "^0.12.4",

build/lib/tsb/utils.js

@@ -9807,10 +9807,10 @@ typescript@^4.7.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
   integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
-typescript@^5.1.0-dev.20230417:
-  version "5.1.0-dev.20230417"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230417.tgz#3c6acdd4e49858bc10f7bdf535e768513ebc55e9"
-  integrity sha512-bEjKfPjxAgvrUViweybCkB++3y9qyF4hCBeXOf998QQDJpLAcaQWmub4IoPZ5yTvrkuGuNzFpy46tytA4p1fbA==
+typescript@^5.1.0-dev.20230424:
+  version "5.1.0-dev.20230424"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.0-dev.20230424.tgz#6b560143787fd346682077dbbad5e1135a476870"
+  integrity sha512-yhQpzzjyLCyXORVY8AgJYaWpm235ZzG/boelYvgloE7v+kCucAdegsBf7duLJzXc/8+wABR2diYMbjPpd5c3Ww==
 
 typical@^4.0.0:
   version "4.0.0"