Restart Language Server for active file (#8128)

Author: elahehrashedi

Extension/package.json

@@ -1360,6 +1360,11 @@
         "title": "%c_cpp.command.buildAndDebugActiveFile.title%",
         "category": "C/C++"
       },
+      {
+        "command": "C_Cpp.RestartIntelliSenseForFile",
+        "title": "%c_cpp.command.restartIntelliSenseForFile.title%",
+        "category": "C/C++"
+      },
       {
         "command": "C_Cpp.LogDiagnostics",
         "title": "%c_cpp.command.logDiagnostics.title%",
@@ -2542,7 +2547,12 @@
         {
           "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
           "command": "C_Cpp.BuildAndDebugActiveFile",
-          "group": "other2_debug@1"
+          "group": "other2@1"
+        },
+        {
+          "when": "editorLangId == 'c' || editorLangId == 'cpp' || editorLangId == 'cuda-cpp'",
+          "command": "C_Cpp.RestartIntelliSenseForFile",
+          "group": "other2@2"
         }
       ],
       "commandPalette": [

Extension/package.nls.json

@@ -12,6 +12,7 @@
     "c_cpp.command.resetDatabase.title": "Reset IntelliSense Database",
     "c_cpp.command.takeSurvey.title": "Take Survey",
     "c_cpp.command.buildAndDebugActiveFile.title": "Build and Debug Active File",
+    "c_cpp.command.restartIntelliSenseForFile.title": "Restart IntelliSense for Active File",
     "c_cpp.command.logDiagnostics.title": "Log Diagnostics",
     "c_cpp.command.referencesViewGroupByType.title": "Group by Reference Type",
     "c_cpp.command.referencesViewUngroupByType.title": "Ungroup by Reference Type",

Extension/src/LanguageServer/client.ts

@@ -484,6 +484,7 @@ const PauseAnalysisNotification: NotificationType<void, void> = new Notification
 const ResumeAnalysisNotification: NotificationType<void, void> = new NotificationType<void, void>('cpptools/resumeAnalysis');
 const CancelAnalysisNotification: NotificationType<void, void> = new NotificationType<void, void>('cpptools/cancelAnalysis');
 const ActiveDocumentChangeNotification: NotificationType<TextDocumentIdentifier, void> = new NotificationType<TextDocumentIdentifier, void>('cpptools/activeDocumentChange');
+const RestartIntelliSenseForFileNotification: NotificationType<TextDocumentIdentifier, void> = new NotificationType<TextDocumentIdentifier, void>('cpptools/restartIntelliSenseForFile');
 const TextEditorSelectionChangeNotification: NotificationType<Range, void> = new NotificationType<Range, void>('cpptools/textEditorSelectionChange');
 const ChangeCppPropertiesNotification: NotificationType<CppPropertiesParams, void> = new NotificationType<CppPropertiesParams, void>('cpptools/didChangeCppProperties');
 const ChangeCompileCommandsNotification: NotificationType<FileChangedParams, void> = new NotificationType<FileChangedParams, void>('cpptools/didChangeCompileCommands');
@@ -630,6 +631,7 @@ export interface Client {
     awaitUntilLanguageClientReady(): void;
     requestSwitchHeaderSource(rootPath: string, fileName: string): Thenable<string>;
     activeDocumentChanged(document: vscode.TextDocument): Promise<void>;
+    restartIntelliSenseForFile(document: vscode.TextDocument): Promise<void>;
     activate(): void;
     selectionChanged(selection: Range): void;
     resetDatabase(): void;
@@ -2439,9 +2441,16 @@ export class DefaultClient implements Client {
      */
     public async activeDocumentChanged(document: vscode.TextDocument): Promise<void> {
         await this.updateActiveDocumentTextOptions();
-        this.notifyWhenLanguageClientReady(() => {
-            this.languageClient.sendNotification(ActiveDocumentChangeNotification, this.languageClient.code2ProtocolConverter.asTextDocumentIdentifier(document));
-        });
+        await this.awaitUntilLanguageClientReady();
+        this.languageClient.sendNotification(ActiveDocumentChangeNotification, this.languageClient.code2ProtocolConverter.asTextDocumentIdentifier(document));
+    }
+
+    /**
+     * send notifications to the language server to restart IntelliSense for the selected file.
+     */
+    public async restartIntelliSenseForFile(document: vscode.TextDocument): Promise<void> {
+        await this.awaitUntilLanguageClientReady();
+        this.languageClient.sendNotification(RestartIntelliSenseForFileNotification, this.languageClient.code2ProtocolConverter.asTextDocumentIdentifier(document));
     }
 
     /**
@@ -3011,6 +3020,7 @@ class NullClient implements Client {
     awaitUntilLanguageClientReady(): void { }
     requestSwitchHeaderSource(rootPath: string, fileName: string): Thenable<string> { return Promise.resolve(""); }
     activeDocumentChanged(document: vscode.TextDocument): Promise<void> { return Promise.resolve(); }
+    restartIntelliSenseForFile(document: vscode.TextDocument): Promise<void> { return Promise.resolve(); }
     activate(): void { }
     selectionChanged(selection: Range): void { }
     resetDatabase(): void { }

Extension/src/LanguageServer/extension.ts

@@ -799,9 +799,21 @@ export function registerCommands(): void {
     disposables.push(vscode.commands.registerCommand('cpptools.activeConfigName', onGetActiveConfigName));
     disposables.push(vscode.commands.registerCommand('cpptools.activeConfigCustomVariable', onGetActiveConfigCustomVariable));
     disposables.push(vscode.commands.registerCommand('cpptools.setActiveConfigName', onSetActiveConfigName));
+    disposables.push(vscode.commands.registerCommand('C_Cpp.RestartIntelliSenseForFile', onRestartIntelliSenseForFile));
+
     getTemporaryCommandRegistrarInstance().executeDelayedCommands();
 }
 
+function onRestartIntelliSenseForFile(): void {
+    onActivationEvent();
+    const activeEditor: vscode.TextEditor | undefined = vscode.window.activeTextEditor;
+    if (!activeEditor || !activeEditor.document || activeEditor.document.uri.scheme !== "file" ||
+        (activeEditor.document.languageId !== "c" && activeEditor.document.languageId !== "cpp" && activeEditor.document.languageId !== "cuda-cpp")) {
+        return;
+    }
+    clients.ActiveClient.restartIntelliSenseForFile(activeEditor.document);
+}
+
 async function onSwitchHeaderSource(): Promise<void> {
     onActivationEvent();
     const activeEditor: vscode.TextEditor | undefined = vscode.window.activeTextEditor;

Extension/src/main.ts

@@ -425,6 +425,7 @@ function rewriteManifest(): Promise<void> {
         "onCommand:extension.pickNativeProcess",
         "onCommand:extension.pickRemoteNativeProcess",
         "onCommand:C_Cpp.BuildAndDebugActiveFile",
+        "onCommand:C_Cpp.RestartIntelliSenseForFile",
         "onCommand:C_Cpp.ConfigurationEditJSON",
         "onCommand:C_Cpp.ConfigurationEditUI",
         "onCommand:C_Cpp.ConfigurationSelect",