Merge branch 'main' of https://github.com/microsoft/vscode-cpptools into coleng/fix_didOpen_didChange_race

Colengms · Colengms · commit 62906f18f5a1 · 2025-01-27T20:05:01.000-08:00
diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1842,7 +1842,8 @@ export class DefaultClient implements Client {
     public onDidChangeTextDocument(textDocumentChangeEvent: vscode.TextDocumentChangeEvent): void {
         if (util.isCpp(textDocumentChangeEvent.document)) {
             // If any file has changed, we need to abort the current rename operation
-            if (workspaceReferences.renamePending) {
+            if (workspaceReferences !== undefined // Occurs when a document changes before cpptools starts.
+                && workspaceReferences.renamePending) {
                 workspaceReferences.cancelCurrentReferenceRequest(refs.CancellationSender.User);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1842,7 +1842,8 @@ export class DefaultClient implements Client {`
`1842`	`1842`	`public onDidChangeTextDocument(textDocumentChangeEvent: vscode.TextDocumentChangeEvent): void {`
`1843`	`1843`	`if (util.isCpp(textDocumentChangeEvent.document)) {`
`1844`	`1844`	`// If any file has changed, we need to abort the current rename operation`
`1845`		`- if (workspaceReferences.renamePending) {`
	`1845`	`+ if (workspaceReferences !== undefined // Occurs when a document changes before cpptools starts.`
	`1846`	`+ && workspaceReferences.renamePending) {`
`1846`	`1847`	`workspaceReferences.cancelCurrentReferenceRequest(refs.CancellationSender.User);`
`1847`	`1848`	`}`
`1848`	`1849`