Remove workaround for microsoft/vscode#66338

Update the minimum VS Code version to 1.35.0, in which the issue was fixed.
jomiller · May 17, 2019 · 9755ada · 9755ada
1 parent 924cb10
commit 9755ada
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 56 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
         "url": "https://github.com/jomiller/vscode-rtags"
     },
     "engines": {
-        "vscode": "^1.32.0"
+        "vscode": "^1.35.0"
     },
     "categories": [
         "Programming Languages"

diff --git a/src/rtagsManager.ts b/src/rtagsManager.ts
@@ -231,12 +231,6 @@ class ProjectReindexTask extends ProjectTask
     private unsavedFiles: TextDocument[];
 }
 
-interface ResumeTimerInfo
-{
-    file: TextDocument;
-    timer: NodeJS.Timer;
-}
-
 function toDiagnosticSeverity(severity: string) : DiagnosticSeverity
 {
     switch (severity)
@@ -1177,7 +1171,8 @@ export class RtagsManager implements Disposable
         const changeConfigCallback =
             async (event: ConfigurationChangeEvent) : Promise<void> =>
             {
-                // FIXME: The onDidChangeWorkspaceFolders event fires before the onDidChangeConfiguration event
+                // FIXME: See https://github.com/microsoft/vscode/issues/73353
+                // The onDidChangeWorkspaceFolders event fires before the onDidChangeConfiguration event
                 // Allow the cached workspace configuration to be updated before proceeding
                 await Promise.resolve();
 
@@ -1462,7 +1457,8 @@ export class RtagsManager implements Disposable
 
     private async updateProjects(event: WorkspaceFoldersChangeEvent) : Promise<void>
     {
-        // FIXME: The onDidChangeWorkspaceFolders event fires before the workspace configuration has been updated
+        // FIXME: See https://github.com/microsoft/vscode/issues/73353
+        // The onDidChangeWorkspaceFolders event fires before the workspace configuration has been updated
         // Allow the workspace configuration to be updated before proceeding
         if (await this.rtagsInitialized)
         {
@@ -1524,9 +1520,7 @@ export class RtagsManager implements Disposable
             return;
         }
 
-        const projectPath = this.getProjectPath(event.document.uri);
-
-        if (!isSourceFile(event.document) || !projectPath)
+        if (!isSourceFile(event.document) || !this.isInProject(event.document.uri))
         {
             return;
         }
@@ -1544,8 +1538,6 @@ export class RtagsManager implements Disposable
             {
                 this.reindexDelayTimers.delete(path);
 
-                await Promise.all(this.resumeDelayedFileWatches(projectPath));
-
                 this.reindexFile(event.document, true);
             };
 
@@ -1554,15 +1546,11 @@ export class RtagsManager implements Disposable
 
     private async reindexSavedFile(file: TextDocument) : Promise<void>
     {
-        const projectPath = this.getProjectPath(file.uri);
-
-        if (!isSourceFile(file) || !projectPath)
+        if (!isSourceFile(file) || !this.isInProject(file.uri))
         {
             return;
         }
 
-        await Promise.all(this.resumeDelayedFileWatches(projectPath));
-
         // Force reindexing if the file was suspended
         // Checking whether reindexing is needed does not work for files that were suspended
         const suspended = await this.resumeFileWatch(file);
@@ -1625,26 +1613,6 @@ export class RtagsManager implements Disposable
         // Block the event loop to ensure that the file is suspended before it is saved
         // Use a timeout because VS Code imposes a time budget on subscribers to the onWillSaveTextDocument event
         event.waitUntil(runRc(args, processCallback));
-
-        if (!event.document.isDirty)
-        {
-            // FIXME: See https://github.com/Microsoft/vscode/issues/66338
-            // The onDidSaveTextDocument event will not fire for clean files
-            // Delay until the file has been saved, and then manually resume the file watch
-            const timeoutCallback =
-                () : void =>
-                {
-                    this.resumeDelayTimers.delete(path);
-                    this.resumeFileWatch(event.document);
-                };
-
-            const timerInfo: ResumeTimerInfo =
-            {
-                file: event.document,
-                timer: setTimeout(timeoutCallback, 2000)
-            };
-            this.resumeDelayTimers.set(path, timerInfo);
-        }
     }
 
     private resumeFileWatch(file: TextDocument) : Promise<Optional<boolean>>
@@ -1691,22 +1659,6 @@ export class RtagsManager implements Disposable
         return getSuspendedFilePaths(projectPath).then(resolveCallback);
     }
 
-    private resumeDelayedFileWatches(projectPath: Uri) : Promise<Optional<boolean>>[]
-    {
-        // Resume files early so that they may be reindexed if necessary
-        let promises: Promise<Optional<boolean>>[] = [];
-        for (const info of this.resumeDelayTimers.values())
-        {
-            if (this.isInProject(info.file.uri, projectPath))
-            {
-                clearTimeout(info.timer);
-                this.resumeDelayTimers.delete(info.file.uri.fsPath);
-                promises.push(this.resumeFileWatch(info.file));
-            }
-        }
-        return promises;
-    }
-
     private reindexActiveProject() : void
     {
         const editor = window.activeTextEditor;
@@ -1973,6 +1925,5 @@ export class RtagsManager implements Disposable
     private unprocessedDiagnostics: string = "";
     private reindexDelayTimers = new Map<string, NodeJS.Timer>();
     private suspendedFilePaths = new Set<string>();
-    private resumeDelayTimers = new Map<string, ResumeTimerInfo>();
     private disposables: Disposable[] = [];
 }