Merge branch 'main' into seanmcm/mergeToVS

sean-mcmanus · sean-mcmanus · commit 5534edf30919 · 2025-04-10T15:56:02.000-07:00
diff --git 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);
                 }
             }
         },

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,10 @@ export function createProtocolFilter(): Middleware {`
`45`	`45`	`// client.takeOwnership() will call client.TrackedDocuments.add() again, but that's ok. It's a Set.`
`46`	`46`	`client.takeOwnership(document);`
`47`	`47`	`void sendMessage(document);`
`48`		`- const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => util.isCpp(e.document));`
`49`		`- client.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined);`
	`48`	`+ client.ready.then(() => {`
	`49`	`+ const cppEditors: vscode.TextEditor[] = vscode.window.visibleTextEditors.filter(e => util.isCpp(e.document));`
	`50`	`+ client.onDidChangeVisibleTextEditors(cppEditors).catch(logAndReturn.undefined);`
	`51`	`+ }).catch(logAndReturn.undefined);`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`	`},`