Merge branch 'main' into show-experiment-name-in-table-header

extension/src/test/cli/index.ts

@@ -1,8 +1,6 @@
 import { mkdirp } from 'fs-extra'
-import { URI } from 'vscode-uri'
-import { stub } from 'sinon'
-import mock from 'mock-require'
 import { TEMP_DIR, ENV_DIR } from './constants'
+require('../../vscode/mockModule')
 
 const importModulesAfterMockingVsCode = () => {
   const { removeDir } = require('../../fileSystem')
@@ -12,32 +10,6 @@ const importModulesAfterMockingVsCode = () => {
   return { removeDir, runMocha, setupVenv }
 }
 
-class MockEventEmitter {
-  public fire() {
-    return stub()
-  }
-
-  public event() {
-    return stub()
-  }
-}
-
-mock('vscode', {
-  EventEmitter: MockEventEmitter,
-  Uri: {
-    file: URI.file
-  }
-})
-
-mock('@hediet/std/disposable', {
-  Disposable: {
-    fn: () => ({
-      track: <T>(disposable: T): T => disposable,
-      untrack: () => undefined
-    })
-  }
-})
-
 const { setupVenv, removeDir, runMocha } = importModulesAfterMockingVsCode()
 
 async function main() {

extension/src/vscode/mockModule.ts

@@ -0,0 +1,29 @@
+import { URI } from 'vscode-uri'
+import { stub } from 'sinon'
+import mock from 'mock-require'
+
+class MockEventEmitter {
+  public fire() {
+    return stub()
+  }
+
+  public event() {
+    return stub()
+  }
+}
+
+mock('vscode', {
+  EventEmitter: MockEventEmitter,
+  Uri: {
+    file: URI.file
+  }
+})
+
+mock('@hediet/std/disposable', {
+  Disposable: {
+    fn: () => ({
+      track: <T>(disposable: T): T => disposable,
+      untrack: () => undefined
+    })
+  }
+})

extension/src/vscode/tree.ts

@@ -12,7 +12,7 @@ export const createTreeView = <T>(
   treeDataProvider: TreeDataProvider<string | T>
 ): TreeView<string | T> =>
   window.createTreeView<string | T>(name, {
-    canSelectMany: true,
+    canSelectMany: false,
     showCollapseAll: true,
     treeDataProvider
   })

scripts/virtualenv-install.ts

@@ -1,5 +1,13 @@
 import { join, resolve } from 'path'
-import { setupVenv } from 'dvc/src/python'
+require('dvc/src/vscode/mockModule')
+
+const importModuleAfterMockingVsCode = () => {
+  const { setupVenv } = require('dvc/src/python')
+
+  return setupVenv
+}
+
+const setupVenv = importModuleAfterMockingVsCode()
 
 const cwd = resolve(__dirname, '..', 'demo')