From 17b718a0b2a1b35e70435f8bc251c59fbc01931f Mon Sep 17 00:00:00 2001 From: luca cappa Date: Thu, 8 May 2025 10:50:28 -0700 Subject: [PATCH] ignore speculative-edit requests --- Extension/package.json | 2 +- .../LanguageServer/copilotCompletionContextProvider.ts | 2 ++ Extension/yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Extension/package.json b/Extension/package.json index ea4fef448..91b36e5d0 100644 --- a/Extension/package.json +++ b/Extension/package.json @@ -6625,7 +6625,7 @@ "xml2js": "^0.6.2" }, "dependencies": { - "@github/copilot-language-server": "^1.266.0", + "@github/copilot-language-server": "^1.316.0", "@vscode/extension-telemetry": "^0.9.6", "chokidar": "^3.6.0", "comment-json": "^4.2.3", diff --git a/Extension/src/LanguageServer/copilotCompletionContextProvider.ts b/Extension/src/LanguageServer/copilotCompletionContextProvider.ts index ca74a0321..3eef9e431 100644 --- a/Extension/src/LanguageServer/copilotCompletionContextProvider.ts +++ b/Extension/src/LanguageServer/copilotCompletionContextProvider.ts @@ -339,6 +339,8 @@ response.uri:${copilotCompletionContext.sourceFileUri || ""}:${copilotC } public async resolve(context: ResolveRequest, copilotCancel: vscode.CancellationToken): Promise { + const proposedEdits = context.documentContext.proposedEdits; + if (proposedEdits) { return []; } // Ignore the request if there are proposed edits. const resolveStartTime = performance.now(); let logMessage = `Copilot: resolve(${context.documentContext.uri}: ${context.documentContext.offset}):`; const cppTimeBudgetMs = await this.fetchTimeBudgetMs(context); diff --git a/Extension/yarn.lock b/Extension/yarn.lock index 1145eba8f..2de55e929 100644 --- a/Extension/yarn.lock +++ b/Extension/yarn.lock @@ -55,10 +55,10 @@ resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" integrity sha1-3mM9s+wu9qPIni8ZA4Bj6KEi4sI= -"@github/copilot-language-server@^1.266.0": - version "1.273.0" - resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@github/copilot-language-server/-/copilot-language-server-1.273.0.tgz#561094fc0d832acae173c40549cd95d27a648fbc" - integrity sha1-VhCU/A2DKsrhc8QFSc2V0npkj7w= +"@github/copilot-language-server@^1.316.0": + version "1.316.0" + resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/@github/copilot-language-server/-/copilot-language-server-1.316.0.tgz#7df2f3857f8e148de36b232ccf8b762dfbb2ec9b" + integrity sha1-ffLzhX+OFI3jayMsz4t2Lfuy7Js= dependencies: vscode-languageserver-protocol "^3.17.5"