Merge pull request #234 from laravel/performance-investigation

Dispose file watchers on deactivate

Author: joetannenbaum

src/extension.ts

@@ -16,6 +16,7 @@ import { updateDiagnostics } from "./diagnostic/diagnostic";
 import { hoverProviders } from "./hover/HoverProvider";
 import { linkProviders } from "./link/LinkProvider";
 import { configAffected } from "./support/config";
+import { disposeWatchers } from "./support/fileWatcher";
 import { info } from "./support/logger";
 import { setParserBinaryPath } from "./support/parser";
 import { clearDefaultPhpCommand, initVendorWatchers } from "./support/php";
@@ -147,6 +148,8 @@ export function deactivate() {
         cleanUpTemp();
     }
 
+    disposeWatchers();
+
     if (client) {
         client.stop();
     }

src/support/fileWatcher.ts

@@ -4,6 +4,8 @@ import { leadingDebounce } from "./util";
 
 type FileEvent = "change" | "create" | "delete";
 
+let watchers: vscode.FileSystemWatcher[] = [];
+
 export type WatcherPattern =
     | string
     | string[]
@@ -72,6 +74,17 @@ export const createFileWatcher = (
             watcher.onDidDelete(callback);
         }
 
+        registerWatcher(watcher);
+
         return watcher;
     });
 };
+
+export const registerWatcher = (watcher: vscode.FileSystemWatcher) => {
+    watchers.push(watcher);
+};
+
+export const disposeWatchers = () => {
+    watchers.forEach((watcher) => watcher.dispose());
+    watchers = [];
+};

src/support/php.ts

@@ -3,6 +3,7 @@ import * as cp from "child_process";
 import * as fs from "fs";
 import * as vscode from "vscode";
 import { config, PhpEnvironment } from "./config";
+import { registerWatcher } from "./fileWatcher";
 import { error, info } from "./logger";
 import { showErrorPopup } from "./popup";
 import {
@@ -78,6 +79,9 @@ export const initVendorWatchers = () => {
     autoloadWatcher.onDidDelete(() => {
         hasVendor = false;
     });
+
+    registerWatcher(watcher);
+    registerWatcher(autoloadWatcher);
 };
 
 const getPhpCommand = (): string => {