@codingame/monaco-vscode-testing-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-testing-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3",
-    "@codingame/monaco-vscode-terminal-service-override": "9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0",
+    "@codingame/monaco-vscode-terminal-service-override": "10.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/debug/browser/callStackWidget.js

@@ -7,14 +7,12 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue, transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/arrays';
 import { autorun, autorunWithStore } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import 'vscode/vscode/vs/base/common/arrays';
-import { Constants } from 'vscode/vscode/vs/base/common/uint';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import './media/callStackWidget.css.js';
-import { EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { EmbeddedCodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
@@ -25,7 +23,6 @@ import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { TextEditorSelectionRevealType } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -167,7 +164,7 @@ let StackAccessibilityProvider = class StackAccessibilityProvider {
         if (e instanceof CallStackFrame) {
             if (e.source && e.line) {
                 return ( localize(
-                    10784,
+                    10873,
                     '{0}, line {1} in {2}',
                     e.name,
                     e.line,
@@ -179,7 +176,7 @@ let StackAccessibilityProvider = class StackAccessibilityProvider {
         assertNever();
     }
     getWidgetAriaLabel() {
-        return ( localize(10785, 'Stack Trace'));
+        return ( localize(10874, 'Stack Trace'));
     }
 };
 StackAccessibilityProvider = ( (__decorate([
@@ -306,7 +303,7 @@ let FrameCodeRenderer = class FrameCodeRenderer extends AbstractFrameRenderer {
     finishRenderTemplate(data) {
         const contributions = [{
                 id: ClickToLocationContribution.ID,
-                instantiation: EditorContributionInstantiation.BeforeFirstInteraction,
+                instantiation: 2 ,
                 ctor: ClickToLocationContribution,
             }];
         const editor = this.containingEditor
@@ -361,7 +358,7 @@ let FrameCodeRenderer = class FrameCodeRenderer extends AbstractFrameRenderer {
         template.toolbar.context = { uri: item.source, range };
         template.editor.setHiddenAreas([
             Range.fromPositions({ column: 1, lineNumber: 1 }, { column: 1, lineNumber: Math.max(1, item.line - CONTEXT_LINES - 1) }),
-            Range.fromPositions({ column: 1, lineNumber: item.line + CONTEXT_LINES + 1 }, { column: 1, lineNumber: Constants.MAX_SAFE_SMALL_INTEGER }),
+            Range.fromPositions({ column: 1, lineNumber: item.line + CONTEXT_LINES + 1 }, { column: 1, lineNumber: 1073741824  }),
         ]);
         template.editor.changeDecorations(accessor => {
             for (const d of template.decorations) {
@@ -370,7 +367,7 @@ let FrameCodeRenderer = class FrameCodeRenderer extends AbstractFrameRenderer {
             template.decorations.length = 0;
             const beforeRange = range.setStartPosition(range.startLineNumber, 1);
             const hasCharactersBefore = !!template.editor.getModel()?.getValueInRange(beforeRange).trim();
-            const decoRange = range.setEndPosition(range.startLineNumber, Constants.MAX_SAFE_SMALL_INTEGER);
+            const decoRange = range.setEndPosition(range.startLineNumber, 1073741824 );
             template.decorations.push(accessor.addDecoration(decoRange, makeStackFrameColumnDecoration(!hasCharactersBefore)));
             template.decorations.push(accessor.addDecoration(decoRange, TOP_STACK_FRAME_DECORATION));
         });
@@ -399,7 +396,7 @@ let MissingCodeRenderer = class MissingCodeRenderer {
         const cast = element;
         templateData.label.element.setResource({
             name: cast.name,
-            description: ( localize(10786, 'Line {0} column {1}', cast.line, cast.column)),
+            description: ( localize(10875, 'Line {0} column {1}', cast.line, cast.column)),
             range: { startLineNumber: cast.line, startColumn: cast.column, endColumn: cast.column, endLineNumber: cast.line },
         }, {
             icon: Codicon.fileBinary,
@@ -460,7 +457,7 @@ let SkippedRenderer = class SkippedRenderer {
             }
             button.enabled = false;
             this.loadFrames(data.current).catch(e => {
-                this.notificationService.error(( localize(10787, 'Failed to load stack frames: {0}', e.message)));
+                this.notificationService.error(( localize(10876, 'Failed to load stack frames: {0}', e.message)));
             });
         }));
         return data;
@@ -498,7 +495,7 @@ let ClickToLocationContribution = class ClickToLocationContribution extends Disp
                 resource: model.uri,
                 options: {
                     selection: Range.fromPositions(( (new Position(this.current.line, this.current.word.startColumn)))),
-                    selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+                    selectionRevealType: 1 ,
                 },
             }, e.hasSideBySideModifier ? SIDE_GROUP : undefined);
         }));
@@ -537,7 +534,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'callStackWidget.goToFile',
-            title: ( localize2(10788, 'Open File')),
+            title: ( localize2(10877, 'Open File')),
             icon: Codicon.goToFile,
             menu: {
                 id: MenuId.DebugCallStackToolbar,
@@ -552,7 +549,7 @@ registerAction2(class extends Action2 {
             resource: uri,
             options: {
                 selection: range,
-                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+                selectionRevealType: 1 ,
             },
         });
     }

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { h, addStandardDisposableListener, EventType, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
-import { ActionBar, ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { mapFindFirst } from 'vscode/vscode/vs/base/common/arraysFind';
@@ -9,18 +9,18 @@ import { assertNever, assert } from 'vscode/vscode/vs/base/common/assert';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { KeyChord, KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 import { Disposable, DisposableStore, toDisposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { isUriComponents, URI } from 'vscode/vscode/vs/base/common/uri';
-import { MouseTargetType, OverlayWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
@@ -33,25 +33,22 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 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.service';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { labels, getLabelForItem } from './codeCoverageDisplayUtils.js';
 import { testingCoverageMissingBranch, testingCoverageReport, testingFilterIcon, testingRerunIcon } from './icons.js';
 import { ManagedTestCoverageBars } from './testCoverageBars.js';
-import { TestingConfigKeys, getTestingConfiguration } from '../common/configuration.js';
-import { TestCommandId } from 'vscode/vscode/vs/workbench/contrib/testing/common/constants';
+import { getTestingConfiguration } from '../common/configuration.js';
 import { FileCoverage } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverage';
 import { ITestCoverageService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverageService.service';
 import { TestId } from 'vscode/vscode/vs/workbench/contrib/testing/common/testId';
 import { ITestService } from 'vscode/vscode/vs/workbench/contrib/testing/common/testService.service';
-import { DetailType } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 import { TestingContextKeys } from '../common/testingContextKeys.js';
 
 const CLASS_HIT = 'coverage-deco-hit';
 const CLASS_MISS = 'coverage-deco-miss';
-const TOGGLE_INLINE_COMMAND_TEXT = ( localize(8209, 'Toggle Inline'));
+const TOGGLE_INLINE_COMMAND_TEXT = ( localize(8285, 'Toggle Inline'));
 const TOGGLE_INLINE_COMMAND_ID = 'testing.toggleInlineCoverage';
 const BRANCH_MISS_INDICATOR_CHARS = 4;
 let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
@@ -93,7 +90,7 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
                 this.clear();
             }
         }));
-        const toolbarEnabled = observableConfigValue(TestingConfigKeys.CoverageToolbarEnabled, true, configurationService);
+        const toolbarEnabled = observableConfigValue("testing.coverageToolbarEnabled" , true, configurationService);
         this._register(autorun(reader => {
             const c = fileCoverage.read(reader);
             if (c && toolbarEnabled.read(reader)) {
@@ -107,17 +104,17 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
             const c = fileCoverage.read(reader);
             if (c) {
                 const evt = configObs.read(reader);
-                if (evt?.hasChanged(EditorOption.lineHeight) !== false) {
+                if (evt?.hasChanged(69 ) !== false) {
                     this.updateEditorStyles();
                 }
             }
         }));
         this._register(editor.onMouseMove(e => {
             const model = editor.getModel();
-            if (e.target.type === MouseTargetType.GUTTER_LINE_NUMBERS && model) {
-                this.hoverLineNumber(editor.getModel(), e.target.position.lineNumber);
+            if (e.target.type === 3  && model) {
+                this.hoverLineNumber(editor.getModel());
             }
-            else if (coverage.showInline.get() && e.target.type === MouseTargetType.CONTENT_TEXT && model) {
+            else if (coverage.showInline.get() && e.target.type === 6  && model) {
                 this.hoverInlineDecoration(model, e.target.position);
             }
             else {
@@ -138,7 +135,7 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
         }));
     }
     updateEditorStyles() {
-        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+        const lineHeight = this.editor.getOption(69 );
         const { style } = this.editor.getContainerDomNode();
         style.setProperty('--vscode-testing-coverage-lineHeight', `${lineHeight}px`);
     }
@@ -166,57 +163,28 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
             });
         }));
     }
-    hoverLineNumber(model, lineNumber) {
-        if (lineNumber === this.hoveredSubject || !this.details) {
+    hoverLineNumber(model) {
+        if (this.hoveredSubject === 'lineNo' || !this.details || this.coverage.showInline.get()) {
             return;
         }
         this.hoveredStore.clear();
-        this.hoveredSubject = lineNumber;
-        const todo = [{ line: lineNumber, dir: 0 }];
-        const toEnable = ( (new Set()));
-        const ranges = this.editor.getVisibleRanges();
-        if (!this.coverage.showInline.get()) {
-            for (let i = 0; i < todo.length; i++) {
-                const { line, dir } = todo[i];
-                if (!( (ranges.some(r => r.startLineNumber <= line && r.endLineNumber >= line)))) {
-                    continue;
-                }
-                let found = false;
-                for (const decoration of model.getLineDecorations(line)) {
-                    if (( (this.decorationIds.has(decoration.id)))) {
-                        toEnable.add(decoration.id);
-                        found = true;
-                    }
-                }
-                if (found) {
-                    if (dir <= 0) {
-                        todo.push({ line: line - 1, dir: -1 });
-                    }
-                    if (dir >= 0) {
-                        todo.push({ line: line + 1, dir: 1 });
-                    }
-                }
+        this.hoveredSubject = 'lineNo';
+        model.changeDecorations(e => {
+            for (const [id, decoration] of this.decorationIds) {
+                const { applyHoverOptions, options } = decoration;
+                const dup = { ...options };
+                applyHoverOptions(dup);
+                e.changeDecorationOptions(id, dup);
             }
-            model.changeDecorations(e => {
-                for (const id of toEnable) {
-                    const { applyHoverOptions, options } = this.decorationIds.get(id);
-                    const dup = { ...options };
-                    applyHoverOptions(dup);
-                    e.changeDecorationOptions(id, dup);
-                }
-            });
-        }
+        });
         this.hoveredStore.add(this.editor.onMouseLeave(() => {
             this.hoveredStore.clear();
         }));
         this.hoveredStore.add(toDisposable(() => {
             this.hoveredSubject = undefined;
             model.changeDecorations(e => {
-                for (const id of toEnable) {
-                    const deco = this.decorationIds.get(id);
-                    if (deco) {
-                        e.changeDecorationOptions(id, deco.options);
-                    }
+                for (const [id, decoration] of this.decorationIds) {
+                    e.changeDecorationOptions(id, decoration.options);
                 }
             });
         }));
@@ -230,7 +198,7 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
         model.changeDecorations(e => {
             for (const detailRange of details.ranges) {
                 const { metadata: { detail, description }, range, primary } = detailRange;
-                if (detail.type === DetailType.Branch) {
+                if (detail.type === 2 ) {
                     const hits = detail.detail.branches[detail.branch].count;
                     const cls = hits ? CLASS_HIT : CLASS_MISS;
                     const showMissIndicator = !hits && range.isEmpty() && ( (detail.detail.branches.some(b => b.count)));
@@ -261,7 +229,7 @@ let CodeCoverageDecorations = class CodeCoverageDecorations extends Disposable {
                     }
                     this.decorationIds.set(e.addDecoration(range, options), { options, applyHoverOptions, detail: detailRange });
                 }
-                else if (detail.type === DetailType.Statement) {
+                else if (detail.type === 1 ) {
                     const cls = detail.count ? CLASS_HIT : CLASS_MISS;
                     const options = {
                         showIfCollapsed: false,
@@ -344,9 +312,9 @@ class CoverageDetailsModel {
             metadata: { detail, description: this.describe(detail, textModel) }
         }))));
         for (const { range, metadata: { detail } } of detailRanges) {
-            if (detail.type === DetailType.Statement && detail.branches) {
+            if (detail.type === 1  && detail.branches) {
                 for (let i = 0; i < detail.branches.length; i++) {
-                    const branch = { type: DetailType.Branch, branch: i, detail };
+                    const branch = { type: 2 , branch: i, detail };
                     detailRanges.push({
                         range: tidyLocation(detail.branches[i].location || Range.fromPositions(range.getEndPosition())),
                         primary: true,
@@ -396,15 +364,15 @@ class CoverageDetailsModel {
         }
     }
     describe(detail, model) {
-        if (detail.type === DetailType.Declaration) {
+        if (detail.type === 0 ) {
             return namedDetailLabel(detail.name, detail);
         }
-        else if (detail.type === DetailType.Statement) {
+        else if (detail.type === 1 ) {
             const text = wrapName(model.getValueInRange(tidyLocation(detail.location)).trim() || `<empty statement>`);
             if (detail.branches?.length) {
                 const covered = detail.branches.filter(b => !!b.count).length;
                 return ( (new MarkdownString())).appendMarkdown(( localize(
-                    8210,
+                    8286,
                     '{0} of {1} of branches in {2} were covered.',
                     covered,
                     detail.branches.length,
@@ -415,18 +383,18 @@ class CoverageDetailsModel {
                 return namedDetailLabel(text, detail);
             }
         }
-        else if (detail.type === DetailType.Branch) {
+        else if (detail.type === 2 ) {
             const text = wrapName(model.getValueInRange(tidyLocation(detail.detail.location)).trim() || `<empty statement>`);
             const { count, label } = detail.detail.branches[detail.branch];
             const label2 = label ? wrapInBackticks(label) : `#${detail.branch + 1}`;
             if (!count) {
-                return ( (new MarkdownString())).appendMarkdown(( localize(8211, 'Branch {0} in {1} was not covered.', label2, text)));
+                return ( (new MarkdownString())).appendMarkdown(( localize(8287, 'Branch {0} in {1} was not covered.', label2, text)));
             }
             else if (count === true) {
-                return ( (new MarkdownString())).appendMarkdown(( localize(8212, 'Branch {0} in {1} was executed.', label2, text)));
+                return ( (new MarkdownString())).appendMarkdown(( localize(8288, 'Branch {0} in {1} was executed.', label2, text)));
             }
             else {
-                return ( (new MarkdownString())).appendMarkdown(( localize(8213, 'Branch {0} in {1} was executed {2} time(s).', label2, text, count)));
+                return ( (new MarkdownString())).appendMarkdown(( localize(8289, 'Branch {0} in {1} was executed {2} time(s).', label2, text, count)));
             }
         }
         assertNever();
@@ -434,10 +402,10 @@ class CoverageDetailsModel {
 }
 function namedDetailLabel(name, detail) {
     return ( (new MarkdownString())).appendMarkdown(!detail.count
-        ? ( localize(8214, '`{0}` was not executed.', name))
+        ? ( localize(8290, '`{0}` was not executed.', name))
         : typeof detail.count === 'number'
-            ? ( localize(8215, '`{0}` was executed {1} time(s).', name, detail.count))
-            : ( localize(8216, '`{0}` was executed.', name)));
+            ? ( localize(8291, '`{0}` was executed {1} time(s).', name, detail.count))
+            : ( localize(8292, '`{0}` was executed.', name)));
 }
 function tidyLocation(location) {
     if (location instanceof Position) {
@@ -479,7 +447,7 @@ let CoverageToolbarWidget = class CoverageToolbarWidget extends Disposable {
             container: this._domNode.bars,
         }));
         this.actionBar = this._register(instaService.createInstance(ActionBar, this._domNode.toolbar, {
-            orientation: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             actionViewItemProvider: (action, options) => {
                 const vm = ( (new CodiconActionViewItem(undefined, action, options)));
                 if (action instanceof ActionWithIcon) {
@@ -507,7 +475,7 @@ let CoverageToolbarWidget = class CoverageToolbarWidget extends Disposable {
     }
     getPosition() {
         return {
-            preference: OverlayWidgetPositionPreference.TOP_CENTER,
+            preference: 2 ,
             stackOridinal: 9,
         };
     }
@@ -534,8 +502,8 @@ let CoverageToolbarWidget = class CoverageToolbarWidget extends Disposable {
             return;
         }
         const toggleAction = ( (new ActionWithIcon('toggleInline', this.coverage.showInline.get()
-            ? ( localize(8217, 'Hide Inline Coverage'))
-            : ( localize(8218, 'Show Inline Coverage')), testingCoverageReport, undefined, () => this.coverage.showInline.set(!this.coverage.showInline.get(), undefined))));
+            ? ( localize(8293, 'Hide Inline Coverage'))
+            : ( localize(8294, 'Show Inline Coverage')), testingCoverageReport, undefined, () => this.coverage.showInline.set(!this.coverage.showInline.get(), undefined))));
         const kb = this.keybindingService.lookupKeybinding(TOGGLE_INLINE_COMMAND_ID);
         if (kb) {
             toggleAction.tooltip = `${TOGGLE_INLINE_COMMAND_TEXT} (${kb.getLabel()})`;
@@ -549,17 +517,17 @@ let CoverageToolbarWidget = class CoverageToolbarWidget extends Disposable {
                 labels.showingFilterFor(testItem.label),
                 testingFilterIcon,
                 undefined,
-                () => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current, this.editor)
+                () => this.commandService.executeCommand("testing.coverageFilterToTestInEditor" , this.current, this.editor)
             ))));
         }
         else if (current.coverage.perTestData?.size) {
             this.actionBar.push(( (new ActionWithIcon('perTestFilter', ( localize(
-                8219,
+                8295,
                 "{0} test(s) ran code in this file",
                 current.coverage.perTestData.size
-            )), testingFilterIcon, undefined, () => this.commandService.executeCommand(TestCommandId.CoverageFilterToTestInEditor, this.current, this.editor)))));
+            )), testingFilterIcon, undefined, () => this.commandService.executeCommand("testing.coverageFilterToTestInEditor" , this.current, this.editor)))));
         }
-        this.actionBar.push(( (new ActionWithIcon('rerun', ( localize(8220, 'Rerun')), testingRerunIcon, !this.isRunning, () => this.rerunTest()))));
+        this.actionBar.push(( (new ActionWithIcon('rerun', ( localize(8296, 'Rerun')), testingRerunIcon, !this.isRunning, () => this.rerunTest()))));
     }
     show() {
         if (this.registered) {
@@ -586,7 +554,7 @@ let CoverageToolbarWidget = class CoverageToolbarWidget extends Disposable {
             });
         }));
         ds.add(this.configurationService.onDidChangeConfiguration(e => {
-            if (this.current && (e.affectsConfiguration(TestingConfigKeys.CoverageBarThresholds) || e.affectsConfiguration(TestingConfigKeys.CoveragePercent))) {
+            if (this.current && (e.affectsConfiguration("testing.coverageBarThresholds" ) || e.affectsConfiguration("testing.displayedCoveragePercent" ))) {
                 this.setCoverage(this.current.coverage, this.current.testId);
             }
         }));
@@ -619,15 +587,15 @@ registerAction2(class ToggleInlineCoverage extends Action2 {
     constructor() {
         super({
             id: TOGGLE_INLINE_COMMAND_ID,
-            title: ( localize2(8221, "Toggle Inline Coverage")),
+            title: ( localize2(8297, "Toggle Inline Coverage")),
             category: Categories.Test,
             keybinding: {
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.Semicolon, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI),
+                weight: 200 ,
+                primary: KeyChord(2048  | 85 , 2048  | 1024  | 39 ),
             },
             toggled: {
                 condition: TestingContextKeys.inlineCoverageEnabled,
-                title: ( localize(8222, "Hide Inline Coverage")),
+                title: ( localize(8298, "Hide Inline Coverage")),
             },
             icon: testingCoverageReport,
             menu: [
@@ -647,10 +615,10 @@ registerAction2(class ToggleInlineCoverage extends Action2 {
 registerAction2(class ToggleCoverageToolbar extends Action2 {
     constructor() {
         super({
-            id: TestCommandId.CoverageToggleToolbar,
-            title: ( localize2(8223, "Test Coverage Toolbar")),
+            id: "testing.coverageToggleToolbar" ,
+            title: ( localize2(8299, "Test Coverage Toolbar")),
             metadata: {
-                description: ( localize2(8224, 'Toggle the sticky coverage bar in the editor.'))
+                description: ( localize2(8300, 'Toggle the sticky coverage bar in the editor.'))
             },
             category: Categories.Test,
             toggled: {
@@ -665,15 +633,15 @@ registerAction2(class ToggleCoverageToolbar extends Action2 {
     }
     run(accessor) {
         const config = accessor.get(IConfigurationService);
-        const value = getTestingConfiguration(config, TestingConfigKeys.CoverageToolbarEnabled);
-        config.updateValue(TestingConfigKeys.CoverageToolbarEnabled, !value);
+        const value = getTestingConfiguration(config, "testing.coverageToolbarEnabled" );
+        config.updateValue("testing.coverageToolbarEnabled" , !value);
     }
 });
 registerAction2(class FilterCoverageToTestInEditor extends Action2 {
     constructor() {
         super({
-            id: TestCommandId.CoverageFilterToTestInEditor,
-            title: ( localize2(8225, "Filter Coverage to Test")),
+            id: "testing.coverageFilterToTestInEditor" ,
+            title: ( localize2(8301, "Filter Coverage to Test")),
             category: Categories.Test,
             icon: Codicon.filter,
             toggled: {
@@ -691,7 +659,7 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
     run(accessor, coverageOrUri, editor) {
         const testCoverageService = accessor.get(ITestCoverageService);
         const quickInputService = accessor.get(IQuickInputService);
-        const activeEditor = editor ?? accessor.get(ICodeEditorService).getActiveCodeEditor();
+        const activeEditor = isCodeEditor(editor) ? editor : accessor.get(ICodeEditorService).getActiveCodeEditor();
         let coverage;
         if (coverageOrUri instanceof FileCoverage) {
             coverage = coverageOrUri;
@@ -729,7 +697,7 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
                 else {
                     const cts = revealScrollCts.value = ( (new CancellationTokenSource()));
                     coverage.detailsForTest(entry.testId, cts.token).then(details => {
-                        const first = details.find(d => d.type === DetailType.Statement);
+                        const first = details.find(d => d.type === 1 );
                         if (!cts.token.isCancellationRequested && first) {
                             activeEditor?.revealLineNearTop(first.location instanceof Position ? first.location.lineNumber : first.location.startLineNumber);
                         }

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

@@ -12,7 +12,6 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 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 { TestingDisplayedCoveragePercent } from '../common/configuration.js';
 import { getTotalCoveragePercent } from 'vscode/vscode/vs/workbench/contrib/testing/common/testCoverage';
 
 const percent = (cc) => clamp(cc.total === 0 ? 1 : cc.covered / cc.total, 0, 1);
@@ -43,9 +42,9 @@ const displayPercent = (value, precision = 2) => {
 };
 const calculateDisplayedStat = (coverage, method) => {
     switch (method) {
-        case TestingDisplayedCoveragePercent.Statement:
+        case "statement" :
             return percent(coverage.statement);
-        case TestingDisplayedCoveragePercent.Minimum: {
+        case "minimum" : {
             let value = percent(coverage.statement);
             if (coverage.branch) {
                 value = Math.min(value, percent(coverage.branch));
@@ -55,7 +54,7 @@ const calculateDisplayedStat = (coverage, method) => {
             }
             return value;
         }
-        case TestingDisplayedCoveragePercent.TotalCoverage:
+        case "totalCoverage" :
             return getTotalCoveragePercent(coverage.statement, coverage.branch, coverage.declaration);
         default:
             assertNever();
@@ -74,11 +73,11 @@ function getLabelForItem(result, testId, commonPrefixLen) {
 }
 var labels;
 ( ((function(labels) {
-    labels.showingFilterFor = (label) => ( localize(10809, "Showing \"{0}\"", label));
-    labels.clickToChangeFiltering = ( localize(10810, 'Click to view coverage for a single test'));
-    labels.percentCoverage = (percent, precision) => ( localize(10811, '{0} Coverage', displayPercent(percent, precision)));
-    labels.allTests = ( localize(10812, 'All tests'));
-    labels.pickShowCoverage = ( localize(10813, 'Pick a test to show coverage for'));
+    labels.showingFilterFor = (label) => ( localize(10898, "Showing \"{0}\"", label));
+    labels.clickToChangeFiltering = ( localize(10899, 'Click to view coverage for a single test'));
+    labels.percentCoverage = (percent, precision) => ( localize(10900, '{0} Coverage', displayPercent(percent, precision)));
+    labels.allTests = ( localize(10901, 'All tests'));
+    labels.pickShowCoverage = ( localize(10902, 'Pick a test to show coverage for'));
 })(labels || (labels = {}))));
 
 export { calculateDisplayedStat, displayPercent, getCoverageColor, getLabelForItem, labels, percent };

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

@@ -1,9 +1,8 @@
 import { ObjectTreeElementCollapseState } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
-import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { isCollapsedInSerializedTestTree } from './testingViewState.js';
-import { TestResultState, InternalTestItem, TestItemExpandState } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
+import { InternalTestItem } from 'vscode/vscode/vs/workbench/contrib/testing/common/testTypes';
 
 let idCounter = 0;
 const getId = () => String(idCounter++);
@@ -18,14 +17,14 @@ class TestItemTreeElement {
         this.treeId = getId();
         this.depth = this.parent ? this.parent.depth + 1 : 0;
         this.retired = false;
-        this.state = TestResultState.Unset;
+        this.state = 0 ;
     }
     toJSON() {
         if (this.depth === 0) {
             return { controllerId: this.test.controllerId };
         }
         const context = {
-            $mid: MarshalledId.TestItemContext,
+            $mid: 16 ,
             tests: [InternalTestItem.serialize(this.test)],
         };
         for (let p = this.parent; p && p.depth > 0; p = p.parent) {
@@ -49,7 +48,7 @@ const testIdentityProvider = {
     getId(element) {
         const expandComponent = element instanceof TestTreeErrorMessage
             ? 'error'
-            : element.test.expand === TestItemExpandState.NotExpandable
+            : element.test.expand === 0
                 ? !!element.children.size
                 : element.test.expand;
         return element.treeId + '\0' + expandComponent;
@@ -71,7 +70,7 @@ const getChildrenForParent = (serialized, rootsWithChildren, node) => {
         ? { element }
         : {
             element,
-            collapsible: element.test.expand !== TestItemExpandState.NotExpandable,
+            collapsible: element.test.expand !== 0 ,
             collapsed: element.test.item.error
                 ? ObjectTreeElementCollapseState.PreserveOrExpanded
                 : (isCollapsedInSerializedTestTree(serialized, element.test.item.extId) ?? element.depth > 0