Update for new TS changes

microsoft · Apr 3, 2023 · cb90205 · cb90205
1 parent 2d63e7c
commit cb90205
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/extensions/typescript-language-features/src/languageFeatures/jsxLinkedEditing.ts b/extensions/typescript-language-features/src/languageFeatures/jsxLinkedEditing.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { DocumentSelector } from '../configuration/documentSelector';
+import { API } from '../tsServer/api';
+import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
-import { conditionalRegistration, requireMinVersion, requireSomeCapability } from '../utils/dependentRegistration';
-import { DocumentSelector } from '../utils/documentSelector';
-import * as typeConverters from '../utils/typeConverters';
-import API from '../utils/api';
+import { conditionalRegistration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
 
 class JsxLinkedEditingSupport implements vscode.LinkedEditingRangeProvider {
 
@@ -25,12 +25,12 @@ class JsxLinkedEditingSupport implements vscode.LinkedEditingRangeProvider {
 		}
 
 		const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
-		const response = await this.client.execute('jsxLinkedEdit', args, token);
+		const response = await this.client.execute('LinkedEditing', args, token);
 		if (response.type !== 'response' || !response.body) {
 			return undefined;
 		}
 
-		const wordPattern = response.body.wordPattern ? new RegExp(response.body.wordPattern) : undefined;
+		const wordPattern = undefined;//response.body.wordPattern ? new RegExp(response.body.wordPattern) : undefined;
 		return new vscode.LinkedEditingRanges(response.body.ranges.map(range => typeConverters.Range.fromTextSpan(range)), wordPattern);
 	}
 }

diff --git a/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts b/extensions/typescript-language-features/src/tsServer/protocol/protocol.d.ts
@@ -52,15 +52,17 @@ declare module 'typescript/lib/tsserverlibrary' {
 			filepath: string;
 		};
 
+		interface LinkedEditingRequest extends FileLocationRequest {
+			readonly command: 'LinkedEditing';
+		}
+
 		interface LinkedEditingRanges {
 			ranges: TextSpan[];
 			wordPattern?: string;
 		}
 
-		interface JsxLinkedEditRequest extends FileLocationRequest { }
-
-		interface JsxLinkedEditResponse extends Response {
-			body?: LinkedEditingRanges;
+		interface LinkedEditingResponse extends Response {
+			readonly body: LinkedEditingRanges;
 		}
 	}
 }
diff --git a/extensions/typescript-language-features/src/tsServer/server.ts b/extensions/typescript-language-features/src/tsServer/server.ts
@@ -495,6 +495,7 @@ export class SyntaxRoutingTsServer extends Disposable implements ITypeScriptServ
 		'format',
 		'formatonkey',
 		'docCommentTemplate',
+		'LinkedEditing'
 	]);
 
 	/**

diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
@@ -76,7 +76,7 @@ interface StandardTsServerRequests {
 	'findSourceDefinition': [Proto.FileLocationRequestArgs, Proto.DefinitionResponse];
 	'getMoveToRefactoringFileSuggestions': [Proto.GetMoveToRefactoringFileSuggestionsRequestArgs, Proto.GetMoveToRefactoringFileSuggestionsResponse];
 	'getEditsForMoveToFileRefactor': [Proto.GetEditsForMoveToFileRefactorRequestArgs, Proto.GetEditsForMoveToFileRefactorResponse];
-	'jsxLinkedEdit': [Proto.FileLocationRequestArgs, Proto.JsxLinkedEditResponse];
+	'LinkedEditing': [Proto.FileLocationRequestArgs, Proto.LinkedEditingResponse];
 }
 
 interface NoResponseTsServerRequests {