debounced fixed

Author: mdesmet

src/manifest/handlers/sourceFileWatchers.ts

@@ -1,30 +1,49 @@
-import { FileSystemWatcher, RelativePattern, Uri, workspace } from "vscode";
+import {
+  FileSystemWatcher,
+  RelativePattern,
+  Uri,
+  workspace,
+} from "vscode";
 import { arrayEquals, debounce } from "../../utils";
 import { dbtProjectContainer } from "../dbtProjectContainer";
-import { OnProjectConfigChanged, ProjectConfigChangedEvent } from "../event/projectConfigChangedEvent";
+import {
+  OnProjectConfigChanged,
+  ProjectConfigChangedEvent,
+} from "../event/projectConfigChangedEvent";
 import { SourceFileChangedEvent } from "../event/sourceFileChangedEvent";
 
 export class SourceFileWatchers implements OnProjectConfigChanged {
   private currentSourcePaths?: string[];
   private sourceFolderWatchers: FileSystemWatcher[] = [];
 
-  public onProjectConfigChanged(event: ProjectConfigChangedEvent) {
+  onProjectConfigChanged(event: ProjectConfigChangedEvent) {
     const { sourcePaths, projectRoot } = event;
     if (
       this.currentSourcePaths === undefined ||
       !arrayEquals(this.currentSourcePaths, sourcePaths)
     ) {
-      sourcePaths.forEach(sourcePath => {
+      sourcePaths.forEach((sourcePath) => {
         const parsedSourcePath = Uri.parse(sourcePath);
-        const globPattern = Uri.joinPath(parsedSourcePath, '**/*.sql').path.substring(1);
+        const globPattern = Uri.joinPath(
+          parsedSourcePath,
+          "**/*.sql"
+        ).path.substring(1);
         const sourceFolderWatcher = workspace.createFileSystemWatcher(
           new RelativePattern(projectRoot, globPattern)
         );
         const event = new SourceFileChangedEvent(projectRoot);
-        sourceFolderWatcher.onDidChange(() => debounce(() => dbtProjectContainer.raiseSourceFileChangedEvent(event), 2000)());
+
+        const debouncedSourceFileChangedEvent = debounce(
+          () => dbtProjectContainer.raiseSourceFileChangedEvent(event),
+          2000
+        );
+
+        sourceFolderWatcher.onDidChange(() =>
+          debouncedSourceFileChangedEvent()
+        );
         this.sourceFolderWatchers.push(sourceFolderWatcher);
       });
       this.currentSourcePaths = sourcePaths;
     }
-  };
+  }
 }

src/utils.ts

@@ -66,14 +66,14 @@ export const arrayEquals = <T>(a: Array<T>, b: Array<T>): boolean => {
 };
 
 export const debounce = (fn: Function, wait: number) => {
-  let timeout: NodeJS.Timeout;
-
-  return function () {
+  let timeout: number;
+  return () => {
     clearTimeout(timeout);
-    timeout = setTimeout(fn(), wait);
+    timeout = setTimeout(fn, wait);
   };
 };
 
+// TODO: potentially needs disposables
 export const setupWatcherHandler = (
   watcher: FileSystemWatcher,
   handler: Function