Merge pull request #183425 from microsoft/aiday/polishingQuickFixes

Polishing the typescript quick fixes
microsoft · May 25, 2023 · fdf6802 · fdf6802
2 parents f6555ce + 81f98eb
commit fdf6802
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
@@ -8,7 +8,7 @@
 	"configuration.suggest.completeFunctionCalls": "Complete functions with their parameter signature.",
 	"configuration.suggest.includeAutomaticOptionalChainCompletions": "Enable/disable showing completions on potentially undefined values that insert an optional chain call. Requires strict null checks to be enabled.",
 	"configuration.suggest.includeCompletionsForImportStatements": "Enable/disable auto-import-style completions on partially-typed import statements.",
-	"typescript.experimental.aiQuickFix": "Enable/disable AI-assisted quick fixes.",
+	"typescript.experimental.aiQuickFix": "Enable/disable AI-assisted quick fixes. Requires an extension providing AI chat functionality.",
 	"typescript.tsdk.desc": "Specifies the folder path to the tsserver and `lib*.d.ts` files under a TypeScript install to use for IntelliSense, for example: `./node_modules/typescript/lib`.\n\n- When specified as a user setting, the TypeScript version from `typescript.tsdk` automatically replaces the built-in TypeScript version.\n- When specified as a workspace setting, `typescript.tsdk` allows you to switch to use that workspace version of TypeScript for IntelliSense with the `TypeScript: Select TypeScript version` command.\n\nSee the [TypeScript documentation](https://code.visualstudio.com/docs/typescript/typescript-compiling#_using-newer-typescript-versions) for more detail about managing TypeScript versions.",
 	"typescript.disableAutomaticTypeAcquisition": "Disables [automatic type acquisition](https://code.visualstudio.com/docs/nodejs/working-with-javascript#_typings-and-automatic-type-acquisition). Automatic type acquisition fetches `@types` packages from npm to improve IntelliSense for external libraries.",
 	"typescript.enablePromptUseWorkspaceTsdk": "Enables prompting of users to use the TypeScript version configured in the workspace for Intellisense.",

diff --git a/extensions/typescript-language-features/src/languageFeatures/quickFix.ts b/extensions/typescript-language-features/src/languageFeatures/quickFix.ts
@@ -28,10 +28,9 @@ type ApplyCodeActionCommand_args = {
 
 class EditorChatFollowUp implements Command {
 
-	id: string = 'needsBetterName.editorChateFollowUp';
+	id: string = '_typescript.quickFix.editorChatFollowUp';
 
 	constructor(private readonly prompt: string, private readonly document: vscode.TextDocument, private readonly range: vscode.Range, private readonly client: ITypeScriptServiceClient) {
-
 	}
 
 	async execute() {
@@ -50,7 +49,7 @@ class EditorChatFollowUp implements Command {
 		if (!filepath) {
 			return;
 		}
-		const response = await this.client.execute('navtree', { file: filepath }, (new vscode.CancellationTokenSource()).token);
+		const response = await this.client.execute('navtree', { file: filepath }, nulToken);
 		if (response.type !== 'response' || !response.body?.childItems) {
 			return;
 		}