Merge pull request #13488 from microsoft/main

Merge for 1.25.0 (2nd time)

Author: sean-mcmanus

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);
                 }
             }
         },

Extension/test/scenarios/SingleRootProject/tests/lmTool.test.ts

@@ -72,13 +72,15 @@ describe('CppConfigurationLanguageModelTool Tests', () => {
             this.isClosed = isClosed;
             this.eol = eol;
             this.lineCount = lineCount;
+            this.encoding = '';
         }
         fileName: string;
         isUntitled: boolean;
         languageId: string;
         version: number;
         isDirty: boolean;
         isClosed: boolean;
+        encoding: string;
         save(): Thenable<boolean> {
             throw new Error('Method not implemented.');
         }