Update to finalized protocol

microsoft · Apr 10, 2023 · 91b6311 · 91b6311
1 parent ee308dc
commit 91b6311
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/extensions/typescript-language-features/src/languageFeatures/jsxLinkedEditing.ts b/extensions/typescript-language-features/src/languageFeatures/jsxLinkedEditing.ts
@@ -25,12 +25,12 @@ class JsxLinkedEditingSupport implements vscode.LinkedEditingRangeProvider {
 		}
 
 		const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
-		const response = await this.client.execute('LinkedEditing', args, token);
+		const response = await this.client.execute('linkedEditingRange', args, token);
 		if (response.type !== 'response' || !response.body) {
 			return undefined;
 		}
 
-		const wordPattern = undefined;//response.body.wordPattern ? new RegExp(response.body.wordPattern) : undefined;
+		const wordPattern = 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,17 +52,13 @@ declare module 'typescript/lib/tsserverlibrary' {
 			filepath: string;
 		};
 
-		interface LinkedEditingRequest extends FileLocationRequest {
-			readonly command: 'LinkedEditing';
-		}
-
-		interface LinkedEditingRanges {
+		interface LinkedEditingRangesBody {
 			ranges: TextSpan[];
 			wordPattern?: string;
 		}
 
-		interface LinkedEditingResponse extends Response {
-			readonly body: LinkedEditingRanges;
+		interface LinkedEditingRangeResponse extends Response {
+			readonly body: LinkedEditingRangesBody;
 		}
 	}
 }
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];
-	'LinkedEditing': [Proto.FileLocationRequestArgs, Proto.LinkedEditingResponse];
+	'linkedEditingRange': [Proto.FileLocationRequestArgs, Proto.LinkedEditingRangeResponse];
 }
 
 interface NoResponseTsServerRequests {