fix: file changes on windows not registering (#844)

JohnstonCode · Feb 28, 2020 · 6b3521a · 6b3521a
1 parent 9754f29
commit 6b3521a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/util.ts b/src/util.ts
@@ -75,6 +75,11 @@ const regexNormalizeWindows = new RegExp("^\\\\(\\w:)", "g");
 export function fixPathSeparator(file: string) {
   file = file.replace(regexNormalizePath, path.sep);
   file = file.replace(regexNormalizeWindows, "$1"); // "\t:\test" => "t:\test"
+
+  if (path.sep === "\\") {
+    file = file.charAt(0).toLowerCase() + file.slice(1);
+  }
+
   return file;
 }
 

diff --git a/src/watchers/repositoryFilesWatcher.ts b/src/watchers/repositoryFilesWatcher.ts
@@ -1,9 +1,15 @@
-import { Event, Uri, workspace, EventEmitter } from "vscode";
+import { Event, Uri, workspace, EventEmitter, RelativePattern } from "vscode";
 import { watch } from "fs";
 import { exists } from "../fs";
-import { join, resolve } from "path";
+import { join } from "path";
 import { debounce } from "../decorators";
-import { anyEvent, filterEvent, IDisposable, isDescendant } from "../util";
+import {
+  anyEvent,
+  filterEvent,
+  IDisposable,
+  isDescendant,
+  fixPathSeparator
+} from "../util";
 
 export class RepositoryFilesWatcher implements IDisposable {
   private disposables: IDisposable[] = [];
@@ -29,7 +35,7 @@ export class RepositoryFilesWatcher implements IDisposable {
 
   constructor(readonly root: string) {
     const fsWatcher = workspace.createFileSystemWatcher(
-      join(resolve(root), "**")
+      new RelativePattern(fixPathSeparator(root), "**")
     );
     this._onRepoChange = new EventEmitter<Uri>();
     this._onRepoCreate = new EventEmitter<Uri>();
@@ -58,8 +64,7 @@ export class RepositoryFilesWatcher implements IDisposable {
 
     const isTmp = (uri: Uri) => /[\\\/]\.svn[\\\/]tmp/.test(uri.path);
 
-    const isRelevant = (uri: Uri) =>
-      !isTmp(uri) && isDescendant(this.root, uri.fsPath);
+    const isRelevant = (uri: Uri) => !isTmp(uri);
 
     this.onDidChange = filterEvent(fsWatcher.onDidChange, isRelevant);
     this.onDidCreate = filterEvent(fsWatcher.onDidCreate, isRelevant);