Refactor: upgrade configWatcher.ts disposal pattern

src/common/configWatcher.ts

@@ -3,23 +3,33 @@
 
 import { Disposable, workspace } from 'vscode';
 import { BLACK_CONFIG_FILES } from './constants';
-import { traceLog } from './logging';
+import { traceError, traceLog } from './logging';
 
 export function createConfigFileWatchers(onConfigChanged: () => Promise<void>): Disposable[] {
     return BLACK_CONFIG_FILES.map((pattern) => {
         const watcher = workspace.createFileSystemWatcher(`**/${pattern}`);
-        const changeDisposable = watcher.onDidChange(async () => {
-            traceLog(`Black config file changed: ${pattern}`);
-            await onConfigChanged();
-        });
-        const createDisposable = watcher.onDidCreate(async () => {
-            traceLog(`Black config file created: ${pattern}`);
-            await onConfigChanged();
-        });
-        const deleteDisposable = watcher.onDidDelete(async () => {
-            traceLog(`Black config file deleted: ${pattern}`);
-            await onConfigChanged();
-        });
-        return Disposable.from(watcher, changeDisposable, createDisposable, deleteDisposable);
+        let disposed = false;
+
+        const handleEvent = (event: string) => {
+            if (disposed) {
+                return;
+            }
+            traceLog(`Black config file ${event}: ${pattern}`);
+            onConfigChanged().catch((e) => traceError(`Config file ${event} handler failed`, e));
+        };
+
+        const changeDisposable = watcher.onDidChange(() => handleEvent('changed'));
+        const createDisposable = watcher.onDidCreate(() => handleEvent('created'));
+        const deleteDisposable = watcher.onDidDelete(() => handleEvent('deleted'));
+
+        return {
+            dispose(): void {
+                disposed = true;
+                changeDisposable.dispose();
+                createDisposable.dispose();
+                deleteDisposable.dispose();
+                watcher.dispose();
+            },
+        };
     });
 }