@codingame/monaco-vscode-testing-service-override 4.4.1 → 4.5.0-improve-code-splitting.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-testing-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,13 +17,16 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
-    "@xterm/addon-canvas": "0.7.0-beta.12",
-    "@xterm/addon-image": "0.8.0-beta.12",
-    "@xterm/addon-search": "0.15.0-beta.12",
-    "@xterm/addon-serialize": "0.13.0-beta.12",
-    "@xterm/addon-unicode11": "0.8.0-beta.12",
-    "@xterm/addon-webgl": "0.18.0-beta.12"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1",
+    "@codingame/monaco-vscode-terminal-service-override": "4.5.0-improve-code-splitting.1"
   }
 }

package/testing.js

@@ -1,21 +1,29 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { ITestProfileService, TestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResultService, TestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestResultStorage, TestResultStorage } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultStorage';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import { TestProfileService } from './vscode/src/vs/workbench/contrib/testing/common/testProfileService.js';
+import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
+import { TestResultService } from './vscode/src/vs/workbench/contrib/testing/common/testResultService.js';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { TestResultStorage } from './vscode/src/vs/workbench/contrib/testing/common/testResultStorage.js';
+import { ITestResultStorage } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultStorage.service';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { TestService } from './vscode/src/vs/workbench/contrib/testing/common/testServiceImpl.js';
-import { ITestingDecorationsService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations';
+import { ITestingDecorationsService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations.service';
 import { TestingDecorationService } from './vscode/src/vs/workbench/contrib/testing/browser/testingDecorations.js';
-import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener';
-import { ITestingContinuousRunService, TestingContinuousRunService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService';
-import { ITestExplorerFilterState, TestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState';
+import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener.service';
+import { TestingContinuousRunService } from './vscode/src/vs/workbench/contrib/testing/common/testingContinuousRunService.js';
+import { ITestingContinuousRunService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService.service';
+import { TestExplorerFilterState } from './vscode/src/vs/workbench/contrib/testing/common/testExplorerFilterState.js';
+import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState.service';
 import { TestingPeekOpener } from './vscode/src/vs/workbench/contrib/testing/browser/testingOutputPeek.js';
-import { ITestCoverageService, TestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
+import { TestCoverageService } from './vscode/src/vs/workbench/contrib/testing/common/testCoverageService.js';
+import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
+import getServiceOverride$1 from '@codingame/monaco-vscode-terminal-service-override';
 import './vscode/src/vs/workbench/contrib/testing/browser/testing.contribution.js';
 import './vscode/src/vs/workbench/contrib/testing/browser/testingConfigurationUi.js';
 
 function getServiceOverride() {
     return {
+        ...getServiceOverride$1(),
         [( ITestService.toString())]: new SyncDescriptor(TestService, [], true),
         [( ITestResultStorage.toString())]: new SyncDescriptor(TestResultStorage, [], true),
         [( ITestProfileService.toString())]: new SyncDescriptor(TestProfileService, [], true),

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

@@ -22,11 +22,11 @@ import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { testingCoverageMissingBranch } from './icons.js';
-import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
-import { TestingContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContextKeys';
+import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
 
 var CodeCoverageDecorations_1, LineHoverWidget_1;
 const MAX_HOVERED_LINES = 30;

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.js

@@ -3,11 +3,11 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { flatTestItemDelimiter } from './display.js';
-import { getChildrenForParent, testIdentityProvider, TestItemTreeElement, TestTreeErrorMessage } from './index.js';
+import { TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from './index.js';
 import { isCollapsedInSerializedTestTree } from './testingViewState.js';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { applyTestItemUpdate } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 
 class ListTestItemElement extends TestItemTreeElement {

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/testItemContextOverlay.js

@@ -1,6 +1,6 @@
-import { capabilityContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
+import { capabilityContextKeys } from '../../common/testProfileService.js';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { TestingContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContextKeys';
+import { TestingContextKeys } from '../../common/testingContextKeys.js';
 
 const getTestItemContextOverlay = (test, capabilities) => {
     if (!test) {

package/vscode/src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.js

@@ -2,12 +2,12 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { getChildrenForParent, testIdentityProvider, TestItemTreeElement, TestTreeErrorMessage } from './index.js';
+import { TestItemTreeElement, TestTreeErrorMessage, getChildrenForParent, testIdentityProvider } from './index.js';
 import { isCollapsedInSerializedTestTree } from './testingViewState.js';
 import { refreshComputedState } from 'vscode/vscode/vs/workbench/contrib/testing/common/getComputedState';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { applyTestItemUpdate } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 
 const computedStateAccessor = {

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

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerIcon, spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { testingColorRunAction, testStatesToIconColors, testStatesToRetiredIconColors } from './theme.js';
+import { testStatesToIconColors, testStatesToRetiredIconColors, testingColorRunAction } from './theme.js';
 
 const testingViewIcon = registerIcon('test-view-icon', Codicon.beaker, ( localizeWithPath(
     'vs/workbench/contrib/testing/browser/icons',

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

@@ -14,7 +14,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { asCssVariableName } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import { chartsRed, chartsYellow, chartsGreen } from 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -28,7 +28,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { getTestingConfiguration, observeTestingConfiguration } from '../common/configuration.js';
 import { getTotalCoveragePercent } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverage';
-import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
+import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
 
 let ManagedTestCoverageBars = class ManagedTestCoverageBars extends Disposable {
     get visible() {

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

@@ -6,7 +6,7 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { DisposableStore, MutableDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
@@ -16,30 +16,32 @@ import { basenameOrAuthority } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { EditorOpenSource } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchCompressibleObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
-import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { testingWasCovered, testingStatesToIcons } from './icons.js';
 import { ManagedTestCoverageBars } from './testCoverageBars.js';
 import { onObservableChange } from '../common/observableUtils.js';
 import { getTotalCoveragePercent, FileCoverage } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverage';
-import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var FileCoverageRenderer_1, DeclarationCoverageRenderer_1;
 let TestCoverageView = class TestCoverageView extends ViewPane {

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

@@ -12,14 +12,15 @@ import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/brows
 import { localize2WithPath, localizeWithPath } 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 { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyGreaterExpr, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-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 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { FocusedViewContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
@@ -27,18 +28,21 @@ import { TestItemTreeElement } from './explorerProjections/index.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 { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
 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, 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 { canUseProfileWithTest } from '../common/testProfileService.js';
+import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { testsInFile, testsUnderUri, expandAndGetTestById } from '../common/testService.js';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { ITestingContinuousRunService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService.service';
+import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener.service';
 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';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const category = Categories.Test;
 const hasAnyTestProvider = ContextKeyGreaterExpr.create(TestingContextKeys.providerCount.key, 0);
@@ -1096,7 +1100,7 @@ class ExecuteTestsUnderUriAction extends Action2 {
                 'vs/workbench/contrib/testing/browser/testExplorerActions',
                 'noTests',
                 'No tests found in the selected file or folder'
-            )), severity: Severity.Info });
+            )), severity: Severity$1.Info });
             return;
         }
         return testService.runTests({ tests, group: this.group });

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

@@ -1,13 +1,14 @@
 import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -23,20 +24,23 @@ import { TestResultsView, OpenMessageInEditorAction, GoToPreviousMessageAction,
 import { TestingProgressTrigger } from './testingProgressUiService.js';
 import { TestingViewPaneContainer } from './testingViewPaneContainer.js';
 import { testingConfiguration } from '../common/configuration.js';
-import 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService';
-import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState';
+import '../common/testCoverageService.js';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import '../common/testExplorerFilterState.js';
+import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState.service';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import 'vscode/vscode/vs/workbench/contrib/testing/common/testResultStorage';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import '../common/testProfileService.js';
+import '../common/testResultService.js';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import '../common/testResultStorage.js';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import '../common/testServiceImpl.js';
 import { TestingContentProvider } from '../common/testingContentProvider.js';
-import { TestingContextKeys } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContextKeys';
-import 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService';
-import { ITestingDecorationsService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations';
-import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import '../common/testingContinuousRunService.js';
+import { ITestingDecorationsService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations.service';
+import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { allTestActions, discoverAndRunTests } from './testExplorerActions.js';
 import './testingConfigurationUi.js';
 

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

@@ -2,11 +2,12 @@ import { groupBy } from 'vscode/vscode/vs/base/common/arrays';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { testingUpdateProfiles } from './icons.js';
 import { testConfigurationGroupNames } from '../common/constants.js';
-import { ITestProfileService, canUseProfileWithTest } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
+import { canUseProfileWithTest } from '../common/testProfileService.js';
+import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
 
 function buildPicker(accessor, { onlyGroup, showConfigureButtons = true, onlyForTest, onlyConfigurable, placeholder = ( ( localizeWithPath(
     'vs/workbench/contrib/testing/browser/testingConfigurationUi',

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

@@ -18,15 +18,16 @@ import { GlyphMarginLane, OverviewRulerLane } from 'vscode/vscode/vs/editor/comm
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, 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 { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { GutterActionsRegistry, EditorLineNumberContextMenu } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu';
 import { getTestItemContextOverlay } from './explorerProjections/testItemContextOverlay.js';
 import { testingRunAllIcon, testingRunIcon, testingStatesToIcons } from './icons.js';
@@ -34,13 +35,15 @@ import { renderTestMessageAsText } from './testMessageColorizer.js';
 import { getTestingConfiguration } from '../common/configuration.js';
 import { labelForTestInState } from '../common/constants.js';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
+import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
 import { LiveTestResult } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService, testsInFile, getContextForTestItem } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
-import { ITestingDecorationsService, TestDecorations } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations';
-import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener';
-import { isFailedState, maxPriority } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingStates';
+import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { testsInFile, getContextForTestItem } from '../common/testService.js';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
+import { TestDecorations } from '../common/testingDecorations.js';
+import { ITestingDecorationsService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingDecorations.service';
+import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener.service';
+import { maxPriority, isFailedState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingStates';
 import { buildTestUri, parseTestUri } from '../common/testingUri.js';
 
 var TestMessageDecoration_1;

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

@@ -8,14 +8,14 @@ import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ContextScopedSuggestEnabledInputWithHistory } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput';
 import { testingFilterIcon } from './icons.js';
-import { StoredValue } from 'vscode/vscode/vs/workbench/contrib/testing/common/storedValue';
-import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState';
-import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService';
+import { StoredValue } from '../common/storedValue.js';
+import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState.service';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
 import { denamespaceTestTag } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 
 const testFilterDescriptions = {

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { append, $, clearNode, reset, h, addStandardDisposableListener, isMouseEvent } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $, h, clearNode, addStandardDisposableListener, isMouseEvent, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
@@ -11,7 +11,7 @@ import { mapFindFirst } from 'vscode/vscode/vs/base/common/arraysFind';
 import { RunOnceScheduler, disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { Color, RGBA } from 'vscode/vscode/vs/base/common/color';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { DisposableStore, Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { fuzzyContains } from 'vscode/vscode/vs/base/common/strings';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
@@ -19,18 +19,20 @@ import './media/testing.css.js';
 import { MarkdownRenderer } from 'vscode/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { MenuEntryActionViewItem, createAndFillInActionBarActions, createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
-import { IMenuService, MenuItemAction, 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 { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { createActionViewItem, MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuItemAction, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { UnmanagedProgress } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IStorageService, WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import { foreground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -44,36 +46,40 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { IThemeService, registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { TestItemTreeElement, TestTreeErrorMessage } from './explorerProjections/index.js';
 import { ListProjection } from './explorerProjections/listProjection.js';
 import { getTestItemContextOverlay } from './explorerProjections/testItemContextOverlay.js';
 import { TestingObjectTree } from './explorerProjections/testingObjectTree.js';
 import { TreeProjection } from './explorerProjections/treeProjection.js';
-import { testingHiddenIcon, testingStatesToIcons, testingRunAllIcon, testingDebugAllIcon, testingRerunIcon, testingDebugIcon, testingContinuousIsOn } from './icons.js';
+import { testingRunAllIcon, testingDebugAllIcon, testingRerunIcon, testingDebugIcon, testingStatesToIcons, testingContinuousIsOn, testingHiddenIcon } from './icons.js';
 import { ReRunLastRun, DebugLastRun } from './testExplorerActions.js';
 import { TestingExplorerFilter } from './testingExplorerFilter.js';
 import { collectTestStateCounts, getTestProgressText } from './testingProgressUiService.js';
 import { getTestingConfiguration } from '../common/configuration.js';
 import { labelForTestInState } from '../common/constants.js';
-import { StoredValue } from 'vscode/vscode/vs/workbench/contrib/testing/common/storedValue';
-import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState';
+import { StoredValue } from '../common/storedValue.js';
+import { ITestExplorerFilterState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testExplorerFilterState.service';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
-import { ITestProfileService, canUseProfileWithTest } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService';
+import { canUseProfileWithTest } from '../common/testProfileService.js';
+import { ITestProfileService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testProfileService.service';
 import { LiveTestResult } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResult';
-import { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService';
-import { ITestService, testCollectionIsEmpty } 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 { ITestResultService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testResultService.service';
+import { testCollectionIsEmpty } from '../common/testService.js';
+import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
+import { TestingContextKeys } from '../common/testingContextKeys.js';
+import { ITestingContinuousRunService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingContinuousRunService.service';
+import { ITestingPeekOpener } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingPeekOpener.service';
 import { statesInOrder, isStateWithResult, isFailedState, cmpPriority } from 'vscode/vscode/vs/workbench/contrib/testing/common/testingStates';
-import { IActivityService, NumberBadge, IconBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { NumberBadge, IconBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
+import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 var ErrorRenderer_1, TestItemRenderer_1;
 let TestingExplorerView = class TestingExplorerView extends ViewPane {