Keep testing configuration alive after losing focus

.github/test_plan.md

@@ -273,11 +273,6 @@ class FailingTests(unittest.TestCase):
     - [ ] `Run Test` works
     - [ ] `Debug Test` works
     - [ ] Module/suite setup methods are also run (run the `test_setup` method to verify)
-- [ ] `Configure Unit Tests` works
-  - [ ] quick pick for framework (and its settings)
-  - [ ] selected framework enabled in workspace settings
-  - [ ] framework's config added (and old config removed)
-  - [ ] other frameworks disabled in workspace settings
 
 #### [`pytest`](https://code.visualstudio.com/docs/python/unit-testing#_pytest-configuration-settings)
 ```python
@@ -326,5 +321,11 @@ def test_failure():
   - [ ] `Run Unit Test Method ...` works
   - [ ] `View Unit Test Output` works
   - [ ] After having at least one failure, `Run Failed Tests` works
+- [ ] `Configure Unit Tests` works
+  - [ ] quick pick for framework (and its settings)
+  - [ ] selected framework enabled in workspace settings
+  - [ ] framework's config added (and old config removed)
+  - [ ] other frameworks disabled in workspace settings
+- [ ] `Configure Unit Tests` does not close if it loses focus
 
 </details>

news/1 Enhancements/4288.md

@@ -0,0 +1 @@
+Keep testing configuration alive when losing UI focus.

src/client/unittests/common/managers/testConfigurationManager.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
-import { OutputChannel, QuickPickItem, Uri, window } from 'vscode';
+import { OutputChannel, QuickPickItem, Uri } from 'vscode';
+import { IApplicationShell } from '../../../common/application/types';
 import { IInstaller, IOutputChannel, Product } from '../../../common/types';
 import { createDeferred } from '../../../common/utils/async';
 import { getSubDirectories } from '../../../common/utils/fs';
@@ -38,6 +39,7 @@ export abstract class TestConfigurationManager implements ITestConfigurationMana
     }
     protected selectTestDir(rootDir: string, subDirs: string[], customOptions: QuickPickItem[] = []): Promise<string> {
         const options = {
+            ignoreFocusOut: true,
             matchOnDescription: true,
             matchOnDetail: true,
             placeHolder: 'Select the directory containing the unit tests'
@@ -59,7 +61,8 @@ export abstract class TestConfigurationManager implements ITestConfigurationMana
         items = [{ label: '.', description: 'Root directory' }, ...items];
         items = customOptions.concat(items);
         const def = createDeferred<string>();
-        window.showQuickPick(items, options).then(item => {
+        const appShell = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+        appShell.showQuickPick(items, options).then(item => {
             if (!item) {
                 return def.resolve();
             }
@@ -72,6 +75,7 @@ export abstract class TestConfigurationManager implements ITestConfigurationMana
 
     protected selectTestFilePattern(): Promise<string> {
         const options = {
+            ignoreFocusOut: true,
             matchOnDescription: true,
             matchOnDetail: true,
             placeHolder: 'Select the pattern to identify test files'
@@ -85,7 +89,8 @@ export abstract class TestConfigurationManager implements ITestConfigurationMana
         ];
 
         const def = createDeferred<string>();
-        window.showQuickPick(items, options).then(item => {
+        const appShell = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+        appShell.showQuickPick(items, options).then(item => {
             if (!item) {
                 return def.resolve();
             }

src/client/unittests/common/testUtils.ts

@@ -1,6 +1,6 @@
 import { inject, injectable, named } from 'inversify';
 import * as path from 'path';
-import { Uri, window, workspace } from 'vscode';
+import { Uri, workspace } from 'vscode';
 import { IApplicationShell, ICommandManager } from '../../common/application/types';
 import * as constants from '../../common/constants';
 import { IUnitTestSettings, Product } from '../../common/types';
@@ -9,14 +9,13 @@ import { CommandSource } from './constants';
 import { TestFlatteningVisitor } from './testVisitors/flatteningVisitor';
 import { ITestsHelper, ITestVisitor, TestFile, TestFolder, TestProvider, Tests, TestSettingsPropertyNames, TestsToRun, UnitTestProduct } from './types';
 
-export async function selectTestWorkspace(): Promise<Uri | undefined> {
+export async function selectTestWorkspace(appShell: IApplicationShell): Promise<Uri | undefined> {
     if (!Array.isArray(workspace.workspaceFolders) || workspace.workspaceFolders.length === 0) {
         return undefined;
     } else if (workspace.workspaceFolders.length === 1) {
         return workspace.workspaceFolders[0].uri;
     } else {
-        // tslint:disable-next-line:no-any prefer-type-cast
-        const workspaceFolder = await (window as any).showWorkspaceFolderPick({ placeHolder: 'Select a workspace' });
+        const workspaceFolder = await appShell.showWorkspaceFolderPick({ placeHolder: 'Select a workspace' });
         return workspaceFolder ? workspaceFolder.uri : undefined;
     }
 }

src/client/unittests/configuration.ts

@@ -60,6 +60,7 @@ export class UnitTestConfigurationService implements IUnitTestConfigurationServi
             detail: 'https://nose.readthedocs.io/'
         }];
         const options = {
+            ignoreFocusOut: true,
             matchOnDescription: true,
             matchOnDetail: true,
             placeHolder: placeHolderMessage

src/client/unittests/main.ts

@@ -9,7 +9,7 @@ import {
     OutputChannel, TextDocument, Uri, window
 } from 'vscode';
 import {
-    ICommandManager, IDocumentManager, IWorkspaceService
+    IApplicationShell, ICommandManager, IDocumentManager, IWorkspaceService
 } from '../common/application/types';
 import * as constants from '../common/constants';
 import '../common/extensions';
@@ -89,7 +89,8 @@ export class UnitTestManagementService implements IUnitTestManagementService, Di
             const wkspaceFolder = this.workspaceService.getWorkspaceFolder(resource);
             wkspace = wkspaceFolder ? wkspaceFolder.uri : undefined;
         } else {
-            wkspace = await selectTestWorkspace();
+            const appShell = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+            wkspace = await selectTestWorkspace(appShell);
         }
         if (!wkspace) {
             return;
@@ -322,7 +323,8 @@ export class UnitTestManagementService implements IUnitTestManagementService, Di
             const wkspaceFolder = this.workspaceService.getWorkspaceFolder(resource);
             wkspace = wkspaceFolder ? wkspaceFolder.uri : undefined;
         } else {
-            wkspace = await selectTestWorkspace();
+            const appShell = this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+            wkspace = await selectTestWorkspace(appShell);
         }
         if (!wkspace) {
             return;