From 42679473602c49bd44b605f5a2725cbdc2242419 Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Sat, 21 May 2022 04:52:30 +1000 Subject: [PATCH 1/2] Mock vs code before attempting to setup venv (#1747) --- extension/src/test/cli/index.ts | 30 +----------------------------- extension/src/vscode/mockModule.ts | 29 +++++++++++++++++++++++++++++ scripts/virtualenv-install.ts | 10 +++++++++- 3 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 extension/src/vscode/mockModule.ts diff --git a/extension/src/test/cli/index.ts b/extension/src/test/cli/index.ts index d659c4d448..4f1bdfcfd7 100644 --- a/extension/src/test/cli/index.ts +++ b/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: (disposable: T): T => disposable, - untrack: () => undefined - }) - } -}) - const { setupVenv, removeDir, runMocha } = importModulesAfterMockingVsCode() async function main() { diff --git a/extension/src/vscode/mockModule.ts b/extension/src/vscode/mockModule.ts new file mode 100644 index 0000000000..525282a387 --- /dev/null +++ b/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: (disposable: T): T => disposable, + untrack: () => undefined + }) + } +}) diff --git a/scripts/virtualenv-install.ts b/scripts/virtualenv-install.ts index 21e40c00bd..fe9f5735e4 100644 --- a/scripts/virtualenv-install.ts +++ b/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') From 38fb5485ac859e06bc8a70749922e5244f6ad334 Mon Sep 17 00:00:00 2001 From: mattseddon <37993418+mattseddon@users.noreply.github.com> Date: Sat, 21 May 2022 05:00:30 +1000 Subject: [PATCH 2/2] Turn off can select many by default in trees (#1748) --- extension/src/vscode/tree.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/src/vscode/tree.ts b/extension/src/vscode/tree.ts index 71e6b5167f..b12db1e5b1 100644 --- a/extension/src/vscode/tree.ts +++ b/extension/src/vscode/tree.ts @@ -12,7 +12,7 @@ export const createTreeView = ( treeDataProvider: TreeDataProvider ): TreeView => window.createTreeView(name, { - canSelectMany: true, + canSelectMany: false, showCollapseAll: true, treeDataProvider })