@codingame/monaco-vscode-testing-service-override 2.0.3 → 2.1.0

package/vscode/src/vs/workbench/contrib/testing/browser/testExplorerActions.js

@@ -1,5 +1,6 @@
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
@@ -7,39 +8,54 @@ import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyGreaterExpr, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/common/views';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { TestItemTreeElement } from './explorerProjections/index.js';
-import { testingDebugIcon, testingRunIcon, testingUpdateProfiles, testingTurnContinuousRunOn, testingContinuousIsOn, testingTurnContinuousRunOff, testingRunAllIcon, testingDebugAllIcon, testingCancelIcon, testingRefreshTests, testingCancelRefreshTests } from './icons.js';
+import { testingDebugIcon, testingCoverageIcon, testingRunIcon, testingUpdateProfiles, testingTurnContinuousRunOn, testingContinuousIsOn, testingTurnContinuousRunOff, testingRunAllIcon, testingDebugAllIcon, testingCoverageAllIcon, testingCancelIcon, testingRefreshTests, testingCancelRefreshTests } from './icons.js';
 import { getTestingConfiguration } from '../common/configuration.js';
 import { testConfigurationGroupNames } from '../common/constants.js';
 import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
 import { canUseProfileWithTest, ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
 import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { expandAndGetTestById, ITestService, testsInFile } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import { expandAndGetTestById, ITestService, testsInFile, testsUnderUri } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
 import { TestingContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContextKeys';
 import { ITestingContinuousRunService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService';
 import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener';
 import { isFailedState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingStates';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 
 const category = Categories.Test;
 const hasAnyTestProvider = ContextKeyGreaterExpr.create(TestingContextKeys.providerCount.key, 0);
+const LABEL_RUN_TESTS = { value: ( localizeWithPath(
+    'vs/workbench/contrib/testing/browser/testExplorerActions',
+    'runSelectedTests',
+    'Run Tests'
+)), original: 'Run Tests' };
+const LABEL_DEBUG_TESTS = { value: ( localizeWithPath(
+    'vs/workbench/contrib/testing/browser/testExplorerActions',
+    'debugSelectedTests',
+    'Debug Tests'
+)), original: 'Debug Tests' };
+const LABEL_COVERAGE_TESTS = { value: ( localizeWithPath(
+    'vs/workbench/contrib/testing/browser/testExplorerActions',
+    'coverageSelectedTests',
+    'Run Tests with Coverage'
+)), original: 'Run Tests withCoverage' };
 class HideTestAction extends Action2 {
     constructor() {
         super({
@@ -120,9 +136,26 @@ const testItemInlineAndInContext = (order, when) => [
         when,
     }
 ];
-class DebugAction extends Action2 {
-    constructor() {
+class RunVisibleAction extends ViewAction {
+    constructor(bitset, desc) {
         super({
+            ...desc,
+            viewId: "workbench.view.testing" ,
+        });
+        this.bitset = bitset;
+    }
+    runInView(accessor, view, ...elements) {
+        const { include, exclude } = view.getTreeIncludeExclude(( elements.map(e => e.test)));
+        return accessor.get(ITestService).runTests({
+            tests: include,
+            exclude,
+            group: this.bitset,
+        });
+    }
+}
+class DebugAction extends RunVisibleAction {
+    constructor() {
+        super(4 , {
             id: "testing.debug" ,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
@@ -133,10 +166,18 @@ class DebugAction extends Action2 {
             menu: testItemInlineAndInContext(12 , ( TestingContextKeys.hasDebuggableTests.isEqualTo(true))),
         });
     }
-    run(acessor, ...elements) {
-        return acessor.get(ITestService).runTests({
-            tests: ( elements.map(e => e.test)),
-            group: 4 ,
+}
+class CoverageAction extends RunVisibleAction {
+    constructor() {
+        super(8 , {
+            id: "testing.coverage" ,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'run with cover test',
+                'Run Test with Coverage'
+            )),
+            icon: testingCoverageIcon,
+            menu: testItemInlineAndInContext(13 , ( TestingContextKeys.hasCoverableTests.isEqualTo(true))),
         });
     }
 }
@@ -177,9 +218,9 @@ class RunUsingProfileAction extends Action2 {
         });
     }
 }
-class RunAction extends Action2 {
+class RunAction extends RunVisibleAction {
     constructor() {
-        super({
+        super(2 , {
             id: "testing.run" ,
             title: ( localizeWithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
@@ -190,12 +231,6 @@ class RunAction extends Action2 {
             menu: testItemInlineAndInContext(11 , ( TestingContextKeys.hasRunnableTests.isEqualTo(true))),
         });
     }
-    run(acessor, ...elements) {
-        return acessor.get(ITestService).runTests({
-            tests: ( elements.map(e => e.test)),
-            group: 2 ,
-        });
-    }
 }
 class SelectDefaultTestProfiles extends Action2 {
     constructor() {
@@ -349,11 +384,11 @@ class StopContinuousRunAction extends Action2 {
     constructor() {
         super({
             id: "testing.stopContinuousRun" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.stopContinuous',
-                "Stop Continuous Run"
-            )), original: 'Stop Continuous Run' },
+                'Stop Continuous Run'
+            )),
             category,
             icon: testingTurnContinuousRunOff,
             menu: continuousMenus(true),
@@ -504,7 +539,7 @@ class GetExplorerSelection extends ViewAction {
         )), viewId: "workbench.view.testing"  });
     }
     runInView(_accessor, view) {
-        const { include, exclude } = view.getTreeIncludeExclude(undefined, 'selected');
+        const { include, exclude } = view.getTreeIncludeExclude(undefined, undefined, 'selected');
         const mapper = (i) => i.item.extId;
         return { include: ( include.map(mapper)), exclude: ( exclude.map(mapper)) };
     }
@@ -513,11 +548,7 @@ class RunSelectedAction extends ExecuteSelectedAction {
     constructor() {
         super({
             id: "testing.runSelected" ,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/testing/browser/testExplorerActions',
-                'runSelectedTests',
-                'Run Tests'
-            )),
+            title: LABEL_RUN_TESTS,
             icon: testingRunAllIcon,
         }, 2 );
     }
@@ -526,15 +557,20 @@ class DebugSelectedAction extends ExecuteSelectedAction {
     constructor() {
         super({
             id: "testing.debugSelected" ,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/testing/browser/testExplorerActions',
-                'debugSelectedTests',
-                'Debug Tests'
-            )),
+            title: LABEL_DEBUG_TESTS,
             icon: testingDebugAllIcon,
         }, 4 );
     }
 }
+class CoverageSelectedAction extends ExecuteSelectedAction {
+    constructor() {
+        super({
+            id: "testing.coverageSelected" ,
+            title: LABEL_COVERAGE_TESTS,
+            icon: testingCoverageAllIcon,
+        }, 8 );
+    }
+}
 const showDiscoveringWhile = (progress, task) => {
     return progress.withProgress({
         location: 10 ,
@@ -611,15 +647,36 @@ class DebugAllAction extends RunOrDebugAllTestsAction {
         )));
     }
 }
+class CoverageAllAction extends RunOrDebugAllTestsAction {
+    constructor() {
+        super({
+            id: "testing.coverageAll" ,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'runAllWithCoverage',
+                'Run All Tests with Coverage'
+            )),
+            icon: testingCoverageIcon,
+            keybinding: {
+                weight: 200 ,
+                primary: KeyChord(2048  | 85 , 2048  | 1024  | 31 ),
+            },
+        }, 8 , ( localizeWithPath(
+            'vs/workbench/contrib/testing/browser/testExplorerActions',
+            'noCoverageTestProvider',
+            'No tests with coverage runners found in this workspace. You may need to install a test provider extension'
+        )));
+    }
+}
 class CancelTestRunAction extends Action2 {
     constructor() {
         super({
             id: "testing.cancelRun" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.cancelRun',
-                "Cancel Test Run"
-            )), original: 'Cancel Test Run' },
+                'Cancel Test Run'
+            )),
             icon: testingCancelIcon,
             keybinding: {
                 weight: 200 ,
@@ -648,11 +705,11 @@ class TestingViewAsListAction extends ViewAction {
         super({
             id: "testing.viewAsList" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.viewAsList',
-                "View as List"
-            )), original: 'View as List' },
+                'View as List'
+            )),
             toggled: ( TestingContextKeys.viewMode.isEqualTo("list" )),
             menu: {
                 id: MenuId.ViewTitle,
@@ -671,11 +728,11 @@ class TestingViewAsTreeAction extends ViewAction {
         super({
             id: "testing.viewAsTree" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.viewAsTree',
-                "View as Tree"
-            )), original: 'View as Tree' },
+                'View as Tree'
+            )),
             toggled: ( TestingContextKeys.viewMode.isEqualTo("true" )),
             menu: {
                 id: MenuId.ViewTitle,
@@ -694,11 +751,11 @@ class TestingSortByStatusAction extends ViewAction {
         super({
             id: "testing.sortByStatus" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.sortByStatus',
-                "Sort by Status"
-            )), original: 'Sort by Status' },
+                'Sort by Status'
+            )),
             toggled: ( TestingContextKeys.viewSorting.isEqualTo("status" )),
             menu: {
                 id: MenuId.ViewTitle,
@@ -717,11 +774,11 @@ class TestingSortByLocationAction extends ViewAction {
         super({
             id: "testing.sortByLocation" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.sortByLocation',
-                "Sort by Location"
-            )), original: 'Sort by Location' },
+                'Sort by Location'
+            )),
             toggled: ( TestingContextKeys.viewSorting.isEqualTo("location" )),
             menu: {
                 id: MenuId.ViewTitle,
@@ -740,11 +797,11 @@ class TestingSortByDurationAction extends ViewAction {
         super({
             id: "testing.sortByDuration" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.sortByDuration',
-                "Sort by Duration"
-            )), original: 'Sort by Duration' },
+                'Sort by Duration'
+            )),
             toggled: ( TestingContextKeys.viewSorting.isEqualTo("duration" )),
             menu: {
                 id: MenuId.ViewTitle,
@@ -762,11 +819,11 @@ class ShowMostRecentOutputAction extends Action2 {
     constructor() {
         super({
             id: "testing.showMostRecentOutput" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.showMostRecentOutput',
-                "Show Output"
-            )), original: 'Show Output' },
+                'Show Output'
+            )),
             category,
             icon: Codicon.terminal,
             keybinding: {
@@ -796,11 +853,11 @@ class CollapseAllAction extends ViewAction {
         super({
             id: "testing.collapseAll" ,
             viewId: "workbench.view.testing" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.collapseAll',
-                "Collapse All Tests"
-            )), original: 'Collapse All Tests' },
+                'Collapse All Tests'
+            )),
             icon: Codicon.collapseAll,
             menu: {
                 id: MenuId.ViewTitle,
@@ -818,13 +875,13 @@ class ClearTestResultsAction extends Action2 {
     constructor() {
         super({
             id: "testing.clearTestResults" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.clearResults',
-                "Clear All Results"
-            )), original: 'Clear All Results' },
+                'Clear All Results'
+            )),
             category,
-            icon: Codicon.trash,
+            icon: Codicon.clearAll,
             menu: [{
                     id: MenuId.TestPeekTitle,
                 }, {
@@ -851,11 +908,11 @@ class GoToTest extends Action2 {
     constructor() {
         super({
             id: "testing.editFocusedTest" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.editFocusedTest',
-                "Go to Test"
-            )), original: 'Go to Test' },
+                'Go to Test'
+            )),
             icon: Codicon.goToFile,
             menu: testItemInlineAndInContext(20 , ( TestingContextKeys.testItemHasUri.isEqualTo(true))),
             keybinding: {
@@ -968,11 +1025,11 @@ class RunAtCursor extends ExecuteTestAtCursor {
     constructor() {
         super({
             id: "testing.runAtCursor" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.runAtCursor',
-                "Run Test at Cursor"
-            )), original: 'Run Test at Cursor' },
+                'Run Test at Cursor'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -986,11 +1043,11 @@ class DebugAtCursor extends ExecuteTestAtCursor {
     constructor() {
         super({
             id: "testing.debugAtCursor" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.debugAtCursor',
-                "Debug Test at Cursor"
-            )), original: 'Debug Test at Cursor' },
+                'Debug Test at Cursor'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1000,6 +1057,79 @@ class DebugAtCursor extends ExecuteTestAtCursor {
         }, 4 );
     }
 }
+class CoverageAtCursor extends ExecuteTestAtCursor {
+    constructor() {
+        super({
+            id: "testing.coverageAtCursor" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'testing.coverageAtCursor',
+                'Run Test at Cursor with Coverage'
+            )),
+            category,
+            keybinding: {
+                weight: 200 ,
+                when: EditorContextKeys.editorTextFocus,
+                primary: KeyChord(2048  | 85 , 2048  | 1024  | 33 ),
+            },
+        }, 8 );
+    }
+}
+class ExecuteTestsUnderUriAction extends Action2 {
+    constructor(options, group) {
+        super({
+            ...options,
+            menu: [{
+                    id: MenuId.ExplorerContext,
+                    when: ( TestingContextKeys.capabilityToContextKey[group].isEqualTo(true)),
+                    group: '6.5_testing',
+                    order: ((group === 2  ? 11  : 12) ) + 0.1,
+                }],
+        });
+        this.group = group;
+    }
+    async run(accessor, uri) {
+        const testService = accessor.get(ITestService);
+        const notificationService = accessor.get(INotificationService);
+        const tests = await Iterable.asyncToArray(testsUnderUri(testService, accessor.get(IUriIdentityService), uri));
+        if (!tests.length) {
+            notificationService.notify({ message: ( localizeWithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'noTests',
+                'No tests found in the selected file or folder'
+            )), severity: Severity.Info });
+            return;
+        }
+        return testService.runTests({ tests, group: this.group });
+    }
+}
+class RunTestsUnderUri extends ExecuteTestsUnderUriAction {
+    constructor() {
+        super({
+            id: "testing.run.uri" ,
+            title: LABEL_RUN_TESTS,
+            category,
+        }, 2 );
+    }
+}
+class DebugTestsUnderUri extends ExecuteTestsUnderUriAction {
+    constructor() {
+        super({
+            id: "testing.debug.uri" ,
+            title: LABEL_DEBUG_TESTS,
+            category,
+        }, 4 );
+    }
+}
+class CoverageTestsUnderUri extends ExecuteTestsUnderUriAction {
+    constructor() {
+        super({
+            id: "testing.coverage.uri" ,
+            title: LABEL_COVERAGE_TESTS,
+            category,
+        }, 8 );
+    }
+}
 class ExecuteTestsInCurrentFile extends Action2 {
     constructor(options, group) {
         super({
@@ -1061,11 +1191,11 @@ class RunCurrentFile extends ExecuteTestsInCurrentFile {
     constructor() {
         super({
             id: "testing.runCurrentFile" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.runCurrentFile',
-                "Run Tests in Current File"
-            )), original: 'Run Tests in Current File' },
+                'Run Tests in Current File'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1079,11 +1209,11 @@ class DebugCurrentFile extends ExecuteTestsInCurrentFile {
     constructor() {
         super({
             id: "testing.debugCurrentFile" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.debugCurrentFile',
-                "Debug Tests in Current File"
-            )), original: 'Debug Tests in Current File' },
+                'Debug Tests in Current File'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1093,6 +1223,24 @@ class DebugCurrentFile extends ExecuteTestsInCurrentFile {
         }, 4 );
     }
 }
+class CoverageCurrentFile extends ExecuteTestsInCurrentFile {
+    constructor() {
+        super({
+            id: "testing.coverageCurrentFile" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'testing.coverageCurrentFile',
+                'Run Tests with Coverage in Current File'
+            )),
+            category,
+            keybinding: {
+                weight: 200 ,
+                when: EditorContextKeys.editorTextFocus,
+                primary: KeyChord(2048  | 85 , 2048  | 1024  | 36 ),
+            },
+        }, 8 );
+    }
+}
 const discoverAndRunTests = async (collection, progress, ids, runTests) => {
     const todo = Promise.all(( ids.map(p => expandAndGetTestById(collection, p))));
     const tests = (await showDiscoveringWhile(progress, todo)).filter(isDefined);
@@ -1158,11 +1306,11 @@ class ReRunFailedTests extends RunOrDebugFailedTests {
     constructor() {
         super({
             id: "testing.reRunFailTests" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.reRunFailTests',
-                "Rerun Failed Tests"
-            )), original: 'Rerun Failed Tests' },
+                'Rerun Failed Tests'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1181,11 +1329,11 @@ class DebugFailedTests extends RunOrDebugFailedTests {
     constructor() {
         super({
             id: "testing.debugFailTests" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.debugFailTests',
-                "Debug Failed Tests"
-            )), original: 'Debug Failed Tests' },
+                'Debug Failed Tests'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1204,11 +1352,11 @@ class ReRunLastRun extends RunOrDebugLastRun {
     constructor() {
         super({
             id: "testing.reRunLastRun" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.reRunLastRun',
-                "Rerun Last Run"
-            )), original: 'Rerun Last Run' },
+                'Rerun Last Run'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1227,11 +1375,11 @@ class DebugLastRun extends RunOrDebugLastRun {
     constructor() {
         super({
             id: "testing.debugLastRun" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.debugLastRun',
-                "Debug Last Run"
-            )), original: 'Debug Last Run' },
+                'Debug Last Run'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1246,15 +1394,38 @@ class DebugLastRun extends RunOrDebugLastRun {
         });
     }
 }
+class CoverageLastRun extends RunOrDebugLastRun {
+    constructor() {
+        super({
+            id: "testing.coverageLastRun" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'testing.coverageLastRun',
+                'Rerun Last Run with Coverage'
+            )),
+            category,
+            keybinding: {
+                weight: 200 ,
+                primary: KeyChord(2048  | 85 , 2048  | 1024  | 42 ),
+            },
+        });
+    }
+    runTest(service, internalTests) {
+        return service.runTests({
+            group: 8 ,
+            tests: internalTests,
+        });
+    }
+}
 class SearchForTestExtension extends Action2 {
     constructor() {
         super({
             id: "testing.searchForTestExtension" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.searchForTestExtension',
-                "Search for Test Extension"
-            )), original: 'Search for Test Extension' },
+                'Search for Test Extension'
+            )),
         });
     }
     async run(accessor) {
@@ -1268,11 +1439,11 @@ class OpenOutputPeek extends Action2 {
     constructor() {
         super({
             id: "testing.openOutputPeek" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.openOutputPeek',
-                "Peek Output"
-            )), original: 'Peek Output' },
+                'Peek Output'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1292,11 +1463,11 @@ class ToggleInlineTestOutput extends Action2 {
     constructor() {
         super({
             id: "testing.toggleInlineTestOutput" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.toggleInlineTestOutput',
-                "Toggle Inline Test Output"
-            )), original: 'Toggle Inline Test Output' },
+                'Toggle Inline Test Output'
+            )),
             category,
             keybinding: {
                 weight: 200 ,
@@ -1335,11 +1506,11 @@ class RefreshTestsAction extends Action2 {
     constructor() {
         super({
             id: "testing.refreshTests" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.refreshTests',
-                "Refresh Tests"
-            )), original: 'Refresh Tests' },
+                'Refresh Tests'
+            )),
             category,
             icon: testingRefreshTests,
             keybinding: {
@@ -1368,11 +1539,11 @@ class CancelTestRefreshAction extends Action2 {
     constructor() {
         super({
             id: "testing.cancelTestRefresh" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'testing.cancelTestRefresh',
-                "Cancel Test Refresh"
-            )), original: 'Cancel Test Refresh' },
+                'Cancel Test Refresh'
+            )),
             category,
             icon: testingCancelRefreshTests,
             menu: refreshMenus(true),
@@ -1382,36 +1553,79 @@ class CancelTestRefreshAction extends Action2 {
         accessor.get(ITestService).cancelRefreshTests();
     }
 }
-class TestCoverageClose extends Action2 {
+class CleareCoverage extends Action2 {
     constructor() {
         super({
             id: "testing.coverage.close" ,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
-                'testing.closeCoverage',
-                "Close Coverage"
-            )), original: 'Close Coverage' },
+                'testing.clearCoverage',
+                'Clear Coverage'
+            )),
             icon: widgetClose,
-            menu: {
-                id: MenuId.ViewTitle,
-                group: 'navigation',
-                order: 10 ,
-                when: ( ContextKeyExpr.equals('view', "workbench.view.testCoverage" ))
-            }
+            category,
+            menu: [{
+                    id: MenuId.ViewTitle,
+                    group: 'navigation',
+                    order: 10 ,
+                    when: ( ContextKeyExpr.equals('view', "workbench.view.testCoverage" ))
+                }, {
+                    id: MenuId.CommandPalette,
+                    when: ( TestingContextKeys.isTestCoverageOpen.isEqualTo(true)),
+                }]
         });
     }
     run(accessor) {
         accessor.get(ITestCoverageService).closeCoverage();
     }
 }
+class OpenCoverage extends Action2 {
+    constructor() {
+        super({
+            id: "testing.openCoverage" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'testing.openCoverage',
+                'Open Coverage'
+            )),
+            category,
+            menu: [{
+                    id: MenuId.CommandPalette,
+                    when: ( TestingContextKeys.hasAnyResults.isEqualTo(true)),
+                }]
+        });
+    }
+    run(accessor) {
+        const results = accessor.get(ITestResultService).results;
+        const task = results.length && results[0].tasks.find(r => r.coverage);
+        if (!task) {
+            const notificationService = accessor.get(INotificationService);
+            notificationService.info(( localizeWithPath(
+                'vs/workbench/contrib/testing/browser/testExplorerActions',
+                'testing.noCoverage',
+                'No coverage information available on the last test run.'
+            )));
+            return;
+        }
+        accessor.get(ITestCoverageService).openCoverage(task, true);
+    }
+}
 const allTestActions = [
     CancelTestRefreshAction,
     CancelTestRunAction,
     ClearTestResultsAction,
+    CleareCoverage,
     CollapseAllAction,
     ConfigureTestProfilesAction,
     ContinuousRunTestAction,
     ContinuousRunUsingProfileTestAction,
+    CoverageAction,
+    CoverageAllAction,
+    CoverageAtCursor,
+    CoverageCurrentFile,
+    CoverageLastRun,
+    CoverageSelectedAction,
+    CoverageTestsUnderUri,
     DebugAction,
     DebugAllAction,
     DebugAtCursor,
@@ -1419,10 +1633,12 @@ const allTestActions = [
     DebugFailedTests,
     DebugLastRun,
     DebugSelectedAction,
-    GoToTest,
+    DebugTestsUnderUri,
     GetExplorerSelection,
     GetSelectedProfiles,
+    GoToTest,
     HideTestAction,
+    OpenCoverage,
     OpenOutputPeek,
     RefreshTestsAction,
     ReRunFailedTests,
@@ -1432,13 +1648,13 @@ const allTestActions = [
     RunAtCursor,
     RunCurrentFile,
     RunSelectedAction,
+    RunTestsUnderUri,
     RunUsingProfileAction,
     SearchForTestExtension,
     SelectDefaultTestProfiles,
     ShowMostRecentOutputAction,
     StartContinuousRunAction,
     StopContinuousRunAction,
-    TestCoverageClose,
     TestingSortByDurationAction,
     TestingSortByLocationAction,
     TestingSortByStatusAction,
@@ -1449,4 +1665,4 @@ const allTestActions = [
     UnhideTestAction,
 ];
 
-export { CancelTestRefreshAction, CancelTestRunAction, ClearTestResultsAction, CollapseAllAction, ConfigureTestProfilesAction, ContinuousRunTestAction, ContinuousRunUsingProfileTestAction, DebugAction, DebugAllAction, DebugAtCursor, DebugCurrentFile, DebugFailedTests, DebugLastRun, DebugSelectedAction, GetExplorerSelection, GetSelectedProfiles, GoToTest, HideTestAction, OpenOutputPeek, ReRunFailedTests, ReRunLastRun, RefreshTestsAction, RunAction, RunAllAction, RunAtCursor, RunCurrentFile, RunSelectedAction, RunUsingProfileAction, SearchForTestExtension, SelectDefaultTestProfiles, ShowMostRecentOutputAction, TestCoverageClose, TestingSortByDurationAction, TestingSortByLocationAction, TestingSortByStatusAction, TestingViewAsListAction, TestingViewAsTreeAction, ToggleInlineTestOutput, UnhideAllTestsAction, UnhideTestAction, allTestActions, discoverAndRunTests };
+export { CancelTestRefreshAction, CancelTestRunAction, ClearTestResultsAction, CleareCoverage, CollapseAllAction, ConfigureTestProfilesAction, ContinuousRunTestAction, ContinuousRunUsingProfileTestAction, CoverageAction, CoverageAllAction, CoverageAtCursor, CoverageCurrentFile, CoverageLastRun, CoverageSelectedAction, DebugAction, DebugAllAction, DebugAtCursor, DebugCurrentFile, DebugFailedTests, DebugLastRun, DebugSelectedAction, GetExplorerSelection, GetSelectedProfiles, GoToTest, HideTestAction, OpenCoverage, OpenOutputPeek, ReRunFailedTests, ReRunLastRun, RefreshTestsAction, RunAction, RunAllAction, RunAtCursor, RunCurrentFile, RunSelectedAction, RunUsingProfileAction, SearchForTestExtension, SelectDefaultTestProfiles, ShowMostRecentOutputAction, TestingSortByDurationAction, TestingSortByLocationAction, TestingSortByStatusAction, TestingViewAsListAction, TestingViewAsTreeAction, ToggleInlineTestOutput, UnhideAllTestsAction, UnhideTestAction, allTestActions, discoverAndRunTests };