edit to compile-commands take effect immediately (#6748)

* draft

* check CompileCommands

* check CompileCommands

* remove updateCompileCommandsFileWatchers

* remove array of filewatchers for compile_commands

* Revert "remove array of filewatchers for compile_commands"

This reverts commit d557c63.

* Revert "remove updateCompileCommandsFileWatchers"

This reverts commit 0e6c03a.

Author: elahehrashedi

Extension/src/LanguageServer/client.ts

@@ -2592,6 +2592,7 @@ export class DefaultClient implements Client {
         if (this.innerLanguageClient !== undefined && this.configuration !== undefined) {
             this.languageClient.sendNotification(IntervalTimerNotification);
             this.configuration.checkCppProperties();
+            this.configuration.checkCompileCommands();
         }
     }
 

Extension/src/LanguageServer/configurations.ts

@@ -120,7 +120,9 @@ export class CppProperties {
     private currentConfigurationIndex: PersistentFolderState<number> | undefined;
     private configFileWatcher: vscode.FileSystemWatcher | null = null;
     private configFileWatcherFallbackTime: Date = new Date(); // Used when file watching fails.
-    private compileCommandFileWatchers: fs.FSWatcher[] = [];
+    private compileCommandsFile: vscode.Uri | undefined | null = undefined;
+    private compileCommandsFileWatchers: fs.FSWatcher[] = [];
+    private compileCommandsFileWatcherFallbackTime: Date = new Date(); // Used when file watching fails.
     private defaultCompilerPath: string | null = null;
     private knownCompilers?: KnownCompiler[];
     private defaultCStandard: string | null = null;
@@ -744,8 +746,8 @@ export class CppProperties {
     // paths are expected to have variables resolved already
     public updateCompileCommandsFileWatchers(): void {
         if (this.configurationJson) {
-            this.compileCommandFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
-            this.compileCommandFileWatchers = []; // reset it
+            this.compileCommandsFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
+            this.compileCommandsFileWatchers = []; // reset it
             const filePaths: Set<string> = new Set<string>();
             this.configurationJson.configurations.forEach(c => {
                 if (c.compileCommands) {
@@ -757,7 +759,7 @@ export class CppProperties {
             });
             try {
                 filePaths.forEach((path: string) => {
-                    this.compileCommandFileWatchers.push(fs.watch(path, (event: string, filename: string) => {
+                    this.compileCommandsFileWatchers.push(fs.watch(path, (event: string, filename: string) => {
                         // Wait 1 second after a change to allow time for the write to finish.
                         if (this.compileCommandsFileWatcherTimer) {
                             clearInterval(this.compileCommandsFileWatcherTimer);
@@ -1669,12 +1671,33 @@ export class CppProperties {
         });
     }
 
+    public checkCompileCommands(): void {
+        // Check for changes in case of file watcher failure.
+        const compileCommandsFile: string | undefined = this.CurrentConfiguration?.compileCommands;
+        if (!compileCommandsFile) {
+            return;
+        }
+        fs.stat(compileCommandsFile, (err, stats) => {
+            if (err) {
+                if (err.code === "ENOENT" && this.compileCommandsFile) {
+                    this.compileCommandsFileWatchers = []; // reset file watchers
+                    this.onCompileCommandsChanged(compileCommandsFile);
+                    this.compileCommandsFile = null; // File deleted
+                }
+            } else if (stats.mtime > this.compileCommandsFileWatcherFallbackTime) {
+                this.compileCommandsFileWatcherFallbackTime = new Date();
+                this.onCompileCommandsChanged(compileCommandsFile);
+                this.compileCommandsFile = vscode.Uri.file(compileCommandsFile); // File created.
+            }
+        });
+    }
+
     dispose(): void {
         this.disposables.forEach((d) => d.dispose());
         this.disposables = [];
 
-        this.compileCommandFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
-        this.compileCommandFileWatchers = []; // reset it
+        this.compileCommandsFileWatchers.forEach((watcher: fs.FSWatcher) => watcher.close());
+        this.compileCommandsFileWatchers = []; // reset it
 
         this.diagnosticCollection.dispose();
     }