From 1709999bb74f5a758dd555e28c7813b390f17c1f Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Thu, 10 Apr 2025 14:17:29 -0700 Subject: [PATCH 1/2] Update lmTool.test.ts to account for interface change in vscode.d.ts (#13484) This works around a change to the vscode TextDocument interface --- Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts b/Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts index 3b45b308e..52d062a40 100644 --- a/Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts +++ b/Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts @@ -72,6 +72,7 @@ describe('CppConfigurationLanguageModelTool Tests', () => { this.isClosed = isClosed; this.eol = eol; this.lineCount = lineCount; + this.encoding = ''; } fileName: string; isUntitled: boolean; @@ -79,6 +80,7 @@ describe('CppConfigurationLanguageModelTool Tests', () => { version: number; isDirty: boolean; isClosed: boolean; + encoding: string; save(): Thenable { throw new Error('Method not implemented.'); } From a204903ff235ecb78e059f401ba1f97fb7ab5668 Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com> Date: Thu, 10 Apr 2025 15:54:56 -0700 Subject: [PATCH 2/2] Fix an error on startup if a file is open (#13487) --- Extension/src/LanguageServer/protocolFilter.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Extension/src/LanguageServer/protocolFilter.ts b/Extension/src/LanguageServer/protocolFilter.ts index 0a166df83..d6462072e 100644 --- a/Extension/src/LanguageServer/protocolFilter.ts +++ b/Extension/src/LanguageServer/protocolFilter.ts @@ -45,8 +45,10 @@ export function createProtocolFilter(): Middleware { // client.takeOwnership() will call client.TrackedDocuments.add() again, but that's ok. It's a Set. client.takeOwnership(document); void sendMessage(document); - const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => util.isCpp(e.document)); - client.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined); + client.ready.then(() => { + const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => util.isCpp(e.document)); + client.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined); + }).catch(logAndReturn.undefined); } } },