Fix table/plots not updating correctly on windows (#3191)

Author: julieg18

extension/src/data/index.ts

@@ -1,9 +1,7 @@
 import { relative } from 'path'
 import { EventEmitter, Event } from 'vscode'
-import {
-  createFileSystemWatcher,
-  getRelativePattern
-} from '../fileSystem/watcher'
+import { getRelativePattern } from '../fileSystem/relativePattern'
+import { createFileSystemWatcher } from '../fileSystem/watcher'
 import { ProcessManager } from '../processManager'
 import { InternalCommands } from '../commands/internal'
 import { ExperimentsOutput, PlotsOutputOrError } from '../cli/dvc/contract'

extension/src/experiments/data/index.ts

@@ -6,10 +6,8 @@ import {
   EXPERIMENTS_GIT_REFS,
   EXPERIMENTS_GIT_REFS_EXEC
 } from './constants'
-import {
-  createFileSystemWatcher,
-  getRelativePattern
-} from '../../fileSystem/watcher'
+import { getRelativePattern } from '../../fileSystem/relativePattern'
+import { createFileSystemWatcher } from '../../fileSystem/watcher'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
 import { ExperimentsOutput } from '../../cli/dvc/contract'
 import { BaseData } from '../../data'

extension/src/fileSystem/data/index.ts

@@ -2,7 +2,8 @@ import { join } from 'path'
 import { Event, EventEmitter } from 'vscode'
 import { isSameOrChild, loadYaml, PartialDvcYaml } from '..'
 import { findFiles } from '../workspace'
-import { createFileSystemWatcher, getRelativePattern } from '../watcher'
+import { getRelativePattern } from '../relativePattern'
+import { createFileSystemWatcher } from '../watcher'
 import { DeferredDisposable } from '../../class/deferred'
 
 export class FileSystemData extends DeferredDisposable {

extension/src/fileSystem/relativePattern.ts

@@ -0,0 +1,28 @@
+import { relative } from 'path'
+import { RelativePattern, Uri, workspace } from 'vscode'
+import { isSameOrChild } from '.'
+
+const joinWithForwardSlashes = (strings: string[]) =>
+  strings.filter(Boolean).join('/')
+
+const getRelativePatternForOutsideWorkspace = (
+  uri: Uri,
+  pattern: string
+): RelativePattern => new RelativePattern(uri, pattern)
+
+export const getRelativePattern = (
+  path: string,
+  pattern: string
+): RelativePattern => {
+  for (const workspaceFolder of workspace.workspaceFolders || []) {
+    const workspaceFolderPath = workspaceFolder.uri.fsPath
+    if (isSameOrChild(workspaceFolderPath, path)) {
+      return new RelativePattern(
+        workspaceFolder,
+        joinWithForwardSlashes([relative(workspaceFolderPath, path), pattern])
+      )
+    }
+  }
+
+  return getRelativePatternForOutsideWorkspace(Uri.file(path), pattern)
+}

extension/src/fileSystem/watcher.ts

@@ -1,30 +1,7 @@
-import { join, relative } from 'path'
 import { utimes } from 'fs-extra'
-import { GlobPattern, RelativePattern, Uri, workspace } from 'vscode'
+import { GlobPattern, workspace } from 'vscode'
 import { Disposable } from '@hediet/std/disposable'
-import { isDirectory, isSameOrChild } from '.'
-
-const getRelativePatternForOutsideWorkspace = (
-  uri: Uri,
-  pattern: string
-): RelativePattern => new RelativePattern(uri, pattern)
-
-export const getRelativePattern = (
-  path: string,
-  pattern: string
-): RelativePattern => {
-  for (const workspaceFolder of workspace.workspaceFolders || []) {
-    const workspaceFolderPath = workspaceFolder.uri.fsPath
-    if (isSameOrChild(workspaceFolderPath, path)) {
-      return new RelativePattern(
-        workspaceFolder,
-        join(relative(workspaceFolderPath, path), pattern)
-      )
-    }
-  }
-
-  return getRelativePatternForOutsideWorkspace(Uri.file(path), pattern)
-}
+import { isDirectory } from '.'
 
 export const fireWatcher = (path: string): Promise<void> => {
   const now = Date.now() / 1000

extension/src/repository/data/index.ts

@@ -1,10 +1,10 @@
 import { Event, EventEmitter } from 'vscode'
 import { AvailableCommands, InternalCommands } from '../../commands/internal'
 import { ProcessManager } from '../../processManager'
+import { getRelativePattern } from '../../fileSystem/relativePattern'
 import {
   createFileSystemWatcher,
-  ignoredDotDirectories,
-  getRelativePattern
+  ignoredDotDirectories
 } from '../../fileSystem/watcher'
 import {
   EXPERIMENTS_GIT_LOGS_REFS,

extension/src/setup/index.ts

@@ -37,10 +37,8 @@ import { WorkspaceExperiments } from '../experiments/workspace'
 import { DvcRunner } from '../cli/dvc/runner'
 import { sendTelemetryEvent, sendTelemetryEventAndThrow } from '../telemetry'
 import { StopWatch } from '../util/time'
-import {
-  createFileSystemWatcher,
-  getRelativePattern
-} from '../fileSystem/watcher'
+import { getRelativePattern } from '../fileSystem/relativePattern'
+import { createFileSystemWatcher } from '../fileSystem/watcher'
 import { EventName } from '../telemetry/constants'
 import { WorkspaceScale } from '../telemetry/collect'
 import { gitPath } from '../cli/git/constants'

extension/src/test/suite/fileSystem/watcher.test.ts

@@ -4,7 +4,7 @@ import { expect } from 'chai'
 import { Uri } from 'vscode'
 import { Disposable } from '@hediet/std/disposable'
 import { restore } from 'sinon'
-import { getRelativePattern } from '../../../fileSystem/watcher'
+import { getRelativePattern } from '../../../fileSystem/relativePattern'
 import { dvcDemoPath, getTestWorkspaceFolder } from '../../util'
 
 suite('File System Watcher Test Suite', () => {
@@ -27,7 +27,7 @@ suite('File System Watcher Test Suite', () => {
       expect(relativePattern.baseUri).to.deep.equal(
         getTestWorkspaceFolder().uri
       )
-      expect(relativePattern.pattern).equal(join('.git', '**'))
+      expect(relativePattern.pattern).equal('.git/**')
     })
 
     it('should return the expected relative pattern for a path outside of the workspace', () => {