Fix an undefined access when an edit is done before cpptools starts

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);
             }
 
@@ -1857,7 +1858,11 @@ export class DefaultClient implements Client {
     public onDidOpenTextDocument(document: vscode.TextDocument): void {
         if (document.uri.scheme === "file") {
             const uri: string = document.uri.toString();
-            openFileVersions.set(uri, document.version);
+            const oldVersion: number | undefined = openFileVersions.get(uri);
+            const newVersion: number = document.version;
+            if (oldVersion === undefined || newVersion > oldVersion) {
+                openFileVersions.set(uri, document.version);
+            }
             void SessionState.buildAndDebugIsSourceFile.set(util.isCppOrCFile(document.uri));
             void SessionState.buildAndDebugIsFolderOpen.set(util.isFolderOpen(document.uri));
         } else {

Extension/src/LanguageServer/extension.ts

@@ -298,7 +298,7 @@ async function onDidChangeSettings(event: vscode.ConfigurationChangeEvent): Prom
     }
 }
 
-async function onDidChangeTextDocument(event: vscode.TextDocumentChangeEvent): Promise<void> {
+function onDidChangeTextDocument(event: vscode.TextDocumentChangeEvent): void {
     const me: Client = clients.getClientFor(event.document.uri);
     me.onDidChangeTextDocument(event);
 }