@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js

@@ -1,8 +1,7 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 import { TERMINAL_VIEW_ID } from './terminal.js';
-const _moduleId = "vs/workbench/contrib/terminal/common/terminalContextKey";
 var TerminalContextKeyStrings;
 ( ((function(TerminalContextKeyStrings) {
     TerminalContextKeyStrings["IsOpen"] = "terminalIsOpen";
@@ -39,18 +38,17 @@ var TerminalContextKeyStrings;
 var TerminalContextKeys;
 ( ((function(TerminalContextKeys) {
     TerminalContextKeys.isOpen = ( (new RawContextKey(TerminalContextKeyStrings.IsOpen, false, true)));
-    TerminalContextKeys.focus = ( (new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localizeWithPath(_moduleId, 0, "Whether the terminal is focused.")))));
-    TerminalContextKeys.focusInAny = ( (new RawContextKey(TerminalContextKeyStrings.FocusInAny, false, ( localizeWithPath(
-        _moduleId,
-        1,
+    TerminalContextKeys.focus = ( (new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localize(8951, "Whether the terminal is focused.")))));
+    TerminalContextKeys.focusInAny = ( (new RawContextKey(TerminalContextKeyStrings.FocusInAny, false, ( localize(
+        8952,
         "Whether any terminal is focused, including detached terminals used in other UI."
     )))));
-    TerminalContextKeys.editorFocus = ( (new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localizeWithPath(_moduleId, 2, "Whether a terminal in the editor area is focused.")))));
-    TerminalContextKeys.count = ( (new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localizeWithPath(_moduleId, 3, "The current number of terminals.")))));
+    TerminalContextKeys.editorFocus = ( (new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(8953, "Whether a terminal in the editor area is focused.")))));
+    TerminalContextKeys.count = ( (new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(8954, "The current number of terminals.")))));
     TerminalContextKeys.groupCount = ( (new RawContextKey(TerminalContextKeyStrings.GroupCount, 0, true)));
     TerminalContextKeys.tabsNarrow = ( (new RawContextKey(TerminalContextKeyStrings.TabsNarrow, false, true)));
     TerminalContextKeys.terminalHasFixedWidth = ( (new RawContextKey(TerminalContextKeyStrings.HasFixedWidth, false, true)));
-    TerminalContextKeys.tabsFocus = ( (new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localizeWithPath(_moduleId, 4, "Whether the terminal tabs widget is focused.")))));
+    TerminalContextKeys.tabsFocus = ( (new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localize(8955, "Whether the terminal tabs widget is focused.")))));
     TerminalContextKeys.webExtensionContributedProfile = ( (new RawContextKey(TerminalContextKeyStrings.WebExtensionContributedProfile, false, true)));
     TerminalContextKeys.terminalHasBeenCreated = ( (new RawContextKey(TerminalContextKeyStrings.TerminalHasBeenCreated, false, true)));
     TerminalContextKeys.terminalEditorActive = ( (new RawContextKey(TerminalContextKeyStrings.TerminalEditorActive, false, true)));
@@ -58,52 +56,38 @@ var TerminalContextKeys;
     TerminalContextKeys.shellType = ( (new RawContextKey(
         TerminalContextKeyStrings.ShellType,
         undefined,
-        { type: 'string', description: ( localizeWithPath(
-            _moduleId,
-            5,
-            "The shell type of the active terminal, this is set to the last known value when no terminals exist."
+        { type: 'string', description: ( localize(
+            8956,
+            "The shell type of the active terminal, this is set if the type can be detected."
         )) }
     )));
-    TerminalContextKeys.altBufferActive = ( (new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localizeWithPath(_moduleId, 6, "Whether the terminal's alt buffer is active.")))));
-    TerminalContextKeys.suggestWidgetVisible = ( (new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localizeWithPath(_moduleId, 7, "Whether the terminal's suggest widget is visible.")))));
+    TerminalContextKeys.altBufferActive = ( (new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(8957, "Whether the terminal's alt buffer is active.")))));
+    TerminalContextKeys.suggestWidgetVisible = ( (new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(8958, "Whether the terminal's suggest widget is visible.")))));
     TerminalContextKeys.notFocus = ( (TerminalContextKeys.focus.toNegated()));
-    TerminalContextKeys.viewShowing = ( (new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localizeWithPath(_moduleId, 8, "Whether the terminal view is showing")))));
-    TerminalContextKeys.textSelected = ( (new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localizeWithPath(_moduleId, 9, "Whether text is selected in the active terminal.")))));
-    TerminalContextKeys.textSelectedInFocused = ( (new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localizeWithPath(_moduleId, 10, "Whether text is selected in a focused terminal.")))));
+    TerminalContextKeys.viewShowing = ( (new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(8959, "Whether the terminal view is showing")))));
+    TerminalContextKeys.textSelected = ( (new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(8960, "Whether text is selected in the active terminal.")))));
+    TerminalContextKeys.textSelectedInFocused = ( (new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(8961, "Whether text is selected in a focused terminal.")))));
     TerminalContextKeys.notTextSelected = ( (TerminalContextKeys.textSelected.toNegated()));
     TerminalContextKeys.findVisible = ( (new RawContextKey(TerminalContextKeyStrings.FindVisible, false, true)));
     TerminalContextKeys.notFindVisible = ( (TerminalContextKeys.findVisible.toNegated()));
     TerminalContextKeys.findInputFocus = ( (new RawContextKey(TerminalContextKeyStrings.FindInputFocused, false, true)));
     TerminalContextKeys.findFocus = ( (new RawContextKey(TerminalContextKeyStrings.FindFocused, false, true)));
     TerminalContextKeys.notFindFocus = ( (TerminalContextKeys.findInputFocus.toNegated()));
-    TerminalContextKeys.processSupported = ( (new RawContextKey(TerminalContextKeyStrings.ProcessSupported, false, ( localizeWithPath(
-        _moduleId,
-        11,
+    TerminalContextKeys.processSupported = ( (new RawContextKey(TerminalContextKeyStrings.ProcessSupported, false, ( localize(
+        8962,
         "Whether terminal processes can be launched in the current workspace."
     )))));
-    TerminalContextKeys.tabsSingularSelection = ( (new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localizeWithPath(
-        _moduleId,
-        12,
-        "Whether one terminal is selected in the terminal tabs list."
-    )))));
-    TerminalContextKeys.splitTerminal = ( (new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localizeWithPath(_moduleId, 13, "Whether the focused tab's terminal is a split terminal.")))));
+    TerminalContextKeys.tabsSingularSelection = ( (new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(8963, "Whether one terminal is selected in the terminal tabs list.")))));
+    TerminalContextKeys.splitTerminal = ( (new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(8964, "Whether the focused tab's terminal is a split terminal.")))));
     TerminalContextKeys.inTerminalRunCommandPicker = ( (new RawContextKey(
         TerminalContextKeyStrings.InTerminalRunCommandPicker,
         false,
-        ( localizeWithPath(
-            _moduleId,
-            14,
-            "Whether the terminal run command picker is currently open."
-        ))
+        ( localize(8965, "Whether the terminal run command picker is currently open."))
     )));
     TerminalContextKeys.terminalShellIntegrationEnabled = ( (new RawContextKey(
         TerminalContextKeyStrings.TerminalShellIntegrationEnabled,
         false,
-        ( localizeWithPath(
-            _moduleId,
-            15,
-            "Whether shell integration is enabled in the active terminal"
-        ))
+        ( localize(8966, "Whether shell integration is enabled in the active terminal"))
     )));
     TerminalContextKeys.shouldShowViewInlineActions = ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', TERMINAL_VIEW_ID)),

package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js

@@ -1,41 +1,36 @@
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
-const _moduleId = "vs/workbench/contrib/terminal/common/terminalStrings";
+import { localize, localize2 } from '../../../../nls.js';
 const terminalStrings = {
-    terminal: ( localizeWithPath(_moduleId, 0, "Terminal")),
-    new: ( localizeWithPath(_moduleId, 1, "New Terminal")),
-    doNotShowAgain: ( localizeWithPath(_moduleId, 2, 'Do Not Show Again')),
-    currentSessionCategory: ( localizeWithPath(_moduleId, 3, 'current session')),
-    previousSessionCategory: ( localizeWithPath(_moduleId, 4, 'previous session')),
-    typeTask: ( localizeWithPath(_moduleId, 5, "Task")),
-    typeLocal: ( localizeWithPath(_moduleId, 6, "Local")),
-    actionCategory: ( localize2WithPath(_moduleId, 7, "Terminal")),
-    focus: ( localize2WithPath(_moduleId, 8, "Focus Terminal")),
-    focusAndHideAccessibleBuffer: ( localize2WithPath(_moduleId, 9, "Focus Terminal and Hide Accessible Buffer")),
+    terminal: ( localize(9068, "Terminal")),
+    new: ( localize(9069, "New Terminal")),
+    doNotShowAgain: ( localize(9070, 'Do Not Show Again')),
+    currentSessionCategory: ( localize(9071, 'current session')),
+    previousSessionCategory: ( localize(9072, 'previous session')),
+    typeTask: ( localize(9073, "Task")),
+    typeLocal: ( localize(9074, "Local")),
+    actionCategory: ( localize2(9075, "Terminal")),
+    focus: ( localize2(9076, "Focus Terminal")),
+    focusAndHideAccessibleBuffer: ( localize2(9077, "Focus Terminal and Hide Accessible Buffer")),
     kill: {
-        ...( localize2WithPath(_moduleId, 10, "Kill Terminal")),
-        short: ( localizeWithPath(_moduleId, 11, "Kill")),
+        ...( localize2(9078, "Kill Terminal")),
+        short: ( localize(9079, "Kill")),
     },
-    moveToEditor: ( localize2WithPath(_moduleId, 12, "Move Terminal into Editor Area")),
-    moveIntoNewWindow: ( localize2WithPath(_moduleId, 13, "Move Terminal into New Window")),
-    moveToTerminalPanel: ( localize2WithPath(_moduleId, 14, "Move Terminal into Panel")),
-    changeIcon: ( localize2WithPath(_moduleId, 15, "Change Icon...")),
-    changeColor: ( localize2WithPath(_moduleId, 16, "Change Color...")),
+    moveToEditor: ( localize2(9080, "Move Terminal into Editor Area")),
+    moveIntoNewWindow: ( localize2(9081, "Move Terminal into New Window")),
+    moveToTerminalPanel: ( localize2(9082, "Move Terminal into Panel")),
+    changeIcon: ( localize2(9083, "Change Icon...")),
+    changeColor: ( localize2(9084, "Change Color...")),
     split: {
-        ...( localize2WithPath(_moduleId, 17, "Split Terminal")),
-        short: ( localizeWithPath(_moduleId, 18, "Split")),
+        ...( localize2(9085, "Split Terminal")),
+        short: ( localize(9086, "Split")),
     },
-    unsplit: ( localize2WithPath(_moduleId, 19, "Unsplit Terminal")),
-    rename: ( localize2WithPath(_moduleId, 20, "Rename...")),
-    toggleSizeToContentWidth: ( localize2WithPath(_moduleId, 21, "Toggle Size to Content Width")),
-    focusHover: ( localize2WithPath(_moduleId, 22, "Focus Hover")),
-    sendSequence: ( localize2WithPath(_moduleId, 23, "Send Custom Sequence To Terminal")),
-    newWithCwd: ( localize2WithPath(
-        _moduleId,
-        24,
-        "Create New Terminal Starting in a Custom Working Directory"
-    )),
-    renameWithArgs: ( localize2WithPath(_moduleId, 25, "Rename the Currently Active Terminal")),
-    scrollToPreviousCommand: ( localize2WithPath(_moduleId, 26, "Scroll To Previous Command")),
-    scrollToNextCommand: ( localize2WithPath(_moduleId, 27, "Scroll To Next Command"))
+    unsplit: ( localize2(9087, "Unsplit Terminal")),
+    rename: ( localize2(9088, "Rename...")),
+    toggleSizeToContentWidth: ( localize2(9089, "Toggle Size to Content Width")),
+    focusHover: ( localize2(9090, "Focus Hover")),
+    sendSequence: ( localize2(9091, "Send Custom Sequence To Terminal")),
+    newWithCwd: ( localize2(9092, "Create New Terminal Starting in a Custom Working Directory")),
+    renameWithArgs: ( localize2(9093, "Rename the Currently Active Terminal")),
+    scrollToPreviousCommand: ( localize2(9094, "Scroll To Previous Command")),
+    scrollToNextCommand: ( localize2(9095, "Scroll To Next Command"))
 };
 export { terminalStrings };

package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.js

@@ -5,7 +5,9 @@ var TerminalSuggestCommandId;
     TerminalSuggestCommandId["SelectNextSuggestion"] = "workbench.action.terminal.selectNextSuggestion";
     TerminalSuggestCommandId["SelectNextPageSuggestion"] = "workbench.action.terminal.selectNextPageSuggestion";
     TerminalSuggestCommandId["AcceptSelectedSuggestion"] = "workbench.action.terminal.acceptSelectedSuggestion";
+    TerminalSuggestCommandId["AcceptSelectedSuggestionEnter"] = "workbench.action.terminal.acceptSelectedSuggestionEnter";
     TerminalSuggestCommandId["HideSuggestWidget"] = "workbench.action.terminal.hideSuggestWidget";
+    TerminalSuggestCommandId["ClearSuggestCache"] = "workbench.action.terminal.clearSuggestCache";
 })(TerminalSuggestCommandId || (TerminalSuggestCommandId = {})));
 const defaultTerminalSuggestCommandsToSkipShell = [
     TerminalSuggestCommandId.SelectPrevSuggestion,
@@ -13,6 +15,8 @@ const defaultTerminalSuggestCommandsToSkipShell = [
     TerminalSuggestCommandId.SelectNextSuggestion,
     TerminalSuggestCommandId.SelectNextPageSuggestion,
     TerminalSuggestCommandId.AcceptSelectedSuggestion,
+    TerminalSuggestCommandId.AcceptSelectedSuggestionEnter,
     TerminalSuggestCommandId.HideSuggestWidget,
+    TerminalSuggestCommandId.ClearSuggestCache,
 ];
 export { TerminalSuggestCommandId, defaultTerminalSuggestCommandsToSkipShell };

package/vscode/src/vs/workbench/contrib/testing/common/constants.js

@@ -1,7 +1,6 @@
 import { stripIcons } from '../../../../base/common/iconLabels.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { TestResultState, TestRunProfileBitset } from './testTypes.js';
-const _moduleId = "vs/workbench/contrib/testing/common/constants";
 var Testing;
 ( ((function(Testing) {
     Testing["ViewletId"] = "workbench.view.extension.test";
@@ -26,19 +25,19 @@ var TestExplorerViewSorting;
     TestExplorerViewSorting["ByDuration"] = "duration";
 })(TestExplorerViewSorting || (TestExplorerViewSorting = {}))));
 const testStateNames = {
-    [TestResultState.Errored]: ( localizeWithPath(_moduleId, 0, 'Errored')),
-    [TestResultState.Failed]: ( localizeWithPath(_moduleId, 1, 'Failed')),
-    [TestResultState.Passed]: ( localizeWithPath(_moduleId, 2, 'Passed')),
-    [TestResultState.Queued]: ( localizeWithPath(_moduleId, 3, 'Queued')),
-    [TestResultState.Running]: ( localizeWithPath(_moduleId, 4, 'Running')),
-    [TestResultState.Skipped]: ( localizeWithPath(_moduleId, 5, 'Skipped')),
-    [TestResultState.Unset]: ( localizeWithPath(_moduleId, 6, 'Not yet run')),
+    [TestResultState.Errored]: ( localize(3809, 'Errored')),
+    [TestResultState.Failed]: ( localize(3810, 'Failed')),
+    [TestResultState.Passed]: ( localize(3811, 'Passed')),
+    [TestResultState.Queued]: ( localize(3812, 'Queued')),
+    [TestResultState.Running]: ( localize(3813, 'Running')),
+    [TestResultState.Skipped]: ( localize(3814, 'Skipped')),
+    [TestResultState.Unset]: ( localize(3815, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localizeWithPath(_moduleId, 7, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(3816, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localizeWithPath(_moduleId, 8, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localizeWithPath(_moduleId, 9, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localizeWithPath(_moduleId, 10, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(3817, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(3818, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(3819, 'Coverage')),
 };
 var TestCommandId;
 ( ((function(TestCommandId) {
@@ -70,6 +69,10 @@ var TestCommandId;
     TestCommandId["GetExplorerSelection"] = "_testing.getExplorerSelection";
     TestCommandId["GetSelectedProfiles"] = "testing.getSelectedProfiles";
     TestCommandId["GoToTest"] = "testing.editFocusedTest";
+    TestCommandId["GoToRelatedTest"] = "testing.goToRelatedTest";
+    TestCommandId["PeekRelatedTest"] = "testing.peekRelatedTest";
+    TestCommandId["GoToRelatedCode"] = "testing.goToRelatedCode";
+    TestCommandId["PeekRelatedCode"] = "testing.peekRelatedCode";
     TestCommandId["HideTestAction"] = "testing.hideTest";
     TestCommandId["OpenCoverage"] = "testing.openCoverage";
     TestCommandId["OpenOutputPeek"] = "testing.openOutputPeek";

package/vscode/src/vs/workbench/contrib/testing/common/testId.js

@@ -46,7 +46,7 @@ class TestId {
         return idx === -1 ? idString : idString.slice(idx + TestIdPathParts.Delimiter.length);
     }
     static isChild(maybeParent, maybeChild) {
-        return maybeChild.startsWith(maybeParent) && maybeChild[maybeParent.length] === TestIdPathParts.Delimiter;
+        return maybeChild[maybeParent.length] === TestIdPathParts.Delimiter && maybeChild.startsWith(maybeParent);
     }
     static compare(a, b) {
         if (a === b) {

package/vscode/src/vs/workbench/contrib/testing/common/testResult.js

@@ -11,13 +11,12 @@ import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import '../../../../base/common/arrays.js';
 import { language } from '../../../../base/common/platform.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { refreshComputedState } from './getComputedState.js';
 import { TestId } from './testId.js';
 import { makeEmptyCounts, terminalStatePriorities, maxPriority, statesInOrder } from './testingStates.js';
 import { TestResultItem, TestResultState, getMarkId, TestMessageType, TestItemExpandState } from './testTypes.js';
-const _moduleId = "vs/workbench/contrib/testing/common/testResult";
 const emptyRawOutput = {
     buffers: [],
     length: 0,
@@ -164,9 +163,8 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this.onNewTask = this.newTaskEmitter.event;
         this.onEndTask = this.endTaskEmitter.event;
         this.tasks = [];
-        this.name = ( localizeWithPath(
-            _moduleId,
-            0,
+        this.name = ( localize(
+            8066,
             'Test run at {0}',
             ( (new Date())).toLocaleString(language)
         ));
@@ -191,7 +189,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this.doSerialize = ( (new Lazy(() => ({
             id: this.id,
             completedAt: this.completedAt,
-            tasks: ( (this.tasks.map(t => ({ id: t.id, name: t.name })))),
+            tasks: ( (this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId })))),
             name: this.name,
             request: this.request,
             items: ( ([...( (this.testById.values()))].map(TestResultItem.serializeWithoutMessages))),
@@ -199,7 +197,7 @@ let LiveTestResult = class LiveTestResult extends Disposable {
         this.doSerializeWithMessages = ( (new Lazy(() => ({
             id: this.id,
             completedAt: this.completedAt,
-            tasks: ( (this.tasks.map(t => ({ id: t.id, name: t.name })))),
+            tasks: ( (this.tasks.map(t => ({ id: t.id, name: t.name, ctrlId: t.ctrlId })))),
             name: this.name,
             request: this.request,
             items: ( ([...( (this.testById.values()))].map(TestResultItem.serialize))),
@@ -392,6 +390,7 @@ class HydratedTestResult {
         this.tasks = ( (serialized.tasks.map((task, i) => ({
             id: task.id,
             name: task.name,
+            ctrlId: task.ctrlId,
             running: false,
             coverage: observableValue(this, undefined),
             output: emptyRawOutput,

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.d.ts

@@ -61,6 +61,20 @@ declare const enum TestMessageType {
     Error = 0,
     Output = 1
 }
+interface ITestMessageStackFrame {
+    label: string;
+    uri: URI | undefined;
+    position: Position | undefined;
+}
+declare namespace ITestMessageStackFrame {
+    interface Serialized {
+        label: string;
+        uri: UriComponents | undefined;
+        position: IPosition | undefined;
+    }
+    const serialize: (stack: Readonly<ITestMessageStackFrame>) => Serialized;
+    const deserialize: (uriIdentity: ITestUriCanonicalizer, stack: Serialized) => ITestMessageStackFrame;
+}
 interface ITestErrorMessage {
     message: string | IMarkdownString;
     type: TestMessageType.Error;
@@ -68,6 +82,7 @@ interface ITestErrorMessage {
     actual: string | undefined;
     contextValue: string | undefined;
     location: IRichLocation | undefined;
+    stackTrace: undefined | ITestMessageStackFrame[];
 }
 declare namespace ITestErrorMessage {
     interface Serialized {
@@ -77,6 +92,7 @@ declare namespace ITestErrorMessage {
         actual: string | undefined;
         contextValue: string | undefined;
         location: IRichLocation.Serialize | undefined;
+        stackTrace: undefined | ITestMessageStackFrame.Serialized[];
     }
     const serialize: (message: Readonly<ITestErrorMessage>) => Serialized;
     const deserialize: (uriIdentity: ITestUriCanonicalizer, message: Serialized) => ITestErrorMessage;
@@ -105,6 +121,10 @@ declare namespace ITestMessage {
     type Serialized = ITestErrorMessage.Serialized | ITestOutputMessage.Serialized;
     const serialize: (message: Readonly<ITestMessage>) => Serialized;
     const deserialize: (uriIdentity: ITestUriCanonicalizer, message: Serialized) => ITestMessage;
+    const isDiffable: (message: ITestMessage) => message is ITestErrorMessage & {
+        actual: string;
+        expected: string;
+    };
 }
 interface ITestTaskState {
     state: TestResultState;
@@ -125,6 +145,7 @@ interface ITestRunTask {
     id: string;
     name: string | undefined;
     running: boolean;
+    ctrlId: string;
 }
 /**
  * The TestItem from .d.ts, as a plain object without children.
@@ -223,6 +244,7 @@ interface ISerializedTestResults {
     tasks: {
         id: string;
         name: string | undefined;
+        ctrlId: string;
     }[];
     /** Human-readable name of the test run. */
     name: string;
@@ -316,4 +338,4 @@ declare namespace IStatementCoverage {
     const deserialize: (serialized: Serialized) => IStatementCoverage;
 }
 
-export { CoverageDetails, DetailType, IBranchCoverage, ICoverageCount, IDeclarationCoverage, IFileCoverage, IRichLocation, type ISerializedTestResults, IStatementCoverage, ITestErrorMessage, ITestItem, ITestMessage, ITestOutputMessage, type ITestRunTask, ITestTaskState, type ITestUriCanonicalizer, InternalTestItem, type ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset };
+export { CoverageDetails, DetailType, IBranchCoverage, ICoverageCount, IDeclarationCoverage, IFileCoverage, IRichLocation, type ISerializedTestResults, IStatementCoverage, ITestErrorMessage, ITestItem, ITestMessage, ITestMessageStackFrame, ITestOutputMessage, type ITestRunTask, ITestTaskState, type ITestUriCanonicalizer, InternalTestItem, type ResolvedTestRunRequest, TestItemExpandState, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset };

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js

@@ -27,6 +27,12 @@ var ExtTestRunProfileKind;
     ExtTestRunProfileKind[ExtTestRunProfileKind["Debug"] = 2] = "Debug";
     ExtTestRunProfileKind[ExtTestRunProfileKind["Coverage"] = 3] = "Coverage";
 })(ExtTestRunProfileKind || (ExtTestRunProfileKind = {})));
+var TestControllerCapability;
+( (function(TestControllerCapability) {
+    TestControllerCapability[TestControllerCapability["Refresh"] = 2] = "Refresh";
+    TestControllerCapability[TestControllerCapability["CodeRelatedToTest"] = 4] = "CodeRelatedToTest";
+    TestControllerCapability[TestControllerCapability["TestRelatedToCode"] = 8] = "TestRelatedToCode";
+})(TestControllerCapability || (TestControllerCapability = {})));
 var TestRunProfileBitset;
 ( (function(TestRunProfileBitset) {
     TestRunProfileBitset[TestRunProfileBitset["Run"] = 2] = "Run";
@@ -61,6 +67,19 @@ var TestMessageType;
     TestMessageType[TestMessageType["Error"] = 0] = "Error";
     TestMessageType[TestMessageType["Output"] = 1] = "Output";
 })(TestMessageType || (TestMessageType = {})));
+var ITestMessageStackFrame;
+( (function(ITestMessageStackFrame) {
+    ITestMessageStackFrame.serialize = (stack) => ({
+        label: stack.label,
+        uri: stack.uri?.toJSON(),
+        position: stack.position?.toJSON(),
+    });
+    ITestMessageStackFrame.deserialize = (uriIdentity, stack) => ({
+        label: stack.label,
+        uri: stack.uri ? uriIdentity.asCanonicalUri(URI.revive(stack.uri)) : undefined,
+        position: stack.position ? Position.lift(stack.position) : undefined,
+    });
+})(ITestMessageStackFrame || (ITestMessageStackFrame = {})));
 var ITestErrorMessage;
 ( (function(ITestErrorMessage) {
     ITestErrorMessage.serialize = (message) => ({
@@ -70,6 +89,7 @@ var ITestErrorMessage;
         actual: message.actual,
         contextValue: message.contextValue,
         location: message.location && IRichLocation.serialize(message.location),
+        stackTrace: message.stackTrace?.map(ITestMessageStackFrame.serialize),
     });
     ITestErrorMessage.deserialize = (uriIdentity, message) => ({
         message: message.message,
@@ -78,6 +98,7 @@ var ITestErrorMessage;
         actual: message.actual,
         contextValue: message.contextValue,
         location: message.location && IRichLocation.deserialize(uriIdentity, message.location),
+        stackTrace: message.stackTrace && ( message.stackTrace.map(s => ITestMessageStackFrame.deserialize(uriIdentity, s))),
     });
 })(ITestErrorMessage || (ITestErrorMessage = {})));
 const getMarkId = (marker, start) => `${start ? 's' : 'e'}${marker}`;
@@ -102,6 +123,7 @@ var ITestMessage;
 ( (function(ITestMessage) {
     ITestMessage.serialize = (message) => message.type === TestMessageType.Error ? ITestErrorMessage.serialize(message) : ITestOutputMessage.serialize(message);
     ITestMessage.deserialize = (uriIdentity, message) => message.type === TestMessageType.Error ? ITestErrorMessage.deserialize(uriIdentity, message) : ITestOutputMessage.deserialize(uriIdentity, message);
+    ITestMessage.isDiffable = (message) => message.type === TestMessageType.Error && message.actual !== undefined && message.expected !== undefined;
 })(ITestMessage || (ITestMessage = {})));
 var ITestTaskState;
 ( (function(ITestTaskState) {
@@ -495,4 +517,4 @@ class AbstractIncrementalTestCollection {
         return {};
     }
 }
-export { AbstractIncrementalTestCollection, CoverageDetails, DetailType, ExtTestRunProfileKind, IBranchCoverage, ICoverageCount, IDeclarationCoverage, IFileCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestOutputMessage, ITestTaskState, InternalTestItem, TestDiffOpType, TestItemExpandState, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testResultStateToContextValues, testRunProfileBitsetList };
+export { AbstractIncrementalTestCollection, CoverageDetails, DetailType, ExtTestRunProfileKind, IBranchCoverage, ICoverageCount, IDeclarationCoverage, IFileCoverage, IRichLocation, IStatementCoverage, ITestErrorMessage, ITestItem, ITestItemUpdate, ITestMessage, ITestMessageStackFrame, ITestOutputMessage, ITestTaskState, InternalTestItem, TestControllerCapability, TestDiffOpType, TestItemExpandState, TestMessageType, TestResultItem, TestResultState, TestRunProfileBitset, TestsDiffOp, applyTestItemUpdate, denamespaceTestTag, getMarkId, isStartControllerTests, namespaceTestTag, testResultStateToContextValues, testRunProfileBitsetList };

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js

@@ -1,18 +1,17 @@
 import { URI } from '../../../../base/common/uri.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { IProductService } from '../../../../platform/product/common/productService.service.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.service.js';
-const _moduleId = "vs/workbench/contrib/url/browser/trustedDomains";
 const TRUSTED_DOMAINS_URI = ( (URI.parse('trustedDomains:/Trusted Domains')));
 const TRUSTED_DOMAINS_STORAGE_KEY = 'http.linkProtectionTrustedDomains';
 const TRUSTED_DOMAINS_CONTENT_STORAGE_KEY = 'http.linkProtectionTrustedDomainsContent';
 const manageTrustedDomainSettingsCommand = {
     id: 'workbench.action.manageTrustedDomain',
     description: {
-        description: ( localize2WithPath(_moduleId, 0, 'Manage Trusted Domains')),
+        description: ( localize2(4783, 'Manage Trusted Domains')),
         args: []
     },
     handler: async (accessor) => {
@@ -29,7 +28,7 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
     const options = [];
     options.push({
         type: 'item',
-        label: ( localizeWithPath(_moduleId, 1, 'Trust {0}', domainToConfigure)),
+        label: ( localize(4784, 'Trust {0}', domainToConfigure)),
         id: 'trust',
         toTrust: domainToConfigure,
         picked: true
@@ -41,7 +40,7 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
             const base = parsedDomainToConfigure.authority.split(':')[0];
             options.push({
                 type: 'item',
-                label: ( localizeWithPath(_moduleId, 2, 'Trust {0} on all ports', base)),
+                label: ( localize(4785, 'Trust {0} on all ports', base)),
                 toTrust: base + ':*',
                 id: 'trust'
             });
@@ -50,20 +49,20 @@ async function configureOpenerTrustedDomainsHandler(trustedDomains, domainToConf
     else {
         options.push({
             type: 'item',
-            label: ( localizeWithPath(_moduleId, 3, 'Trust {0} and all its subdomains', domainEnd)),
+            label: ( localize(4786, 'Trust {0} and all its subdomains', domainEnd)),
             toTrust: topLevelDomain,
             id: 'trust'
         });
     }
     options.push({
         type: 'item',
-        label: ( localizeWithPath(_moduleId, 4, 'Trust all domains (disables link protection)')),
+        label: ( localize(4787, 'Trust all domains (disables link protection)')),
         toTrust: '*',
         id: 'trust'
     });
     options.push({
         type: 'item',
-        label: ( localizeWithPath(_moduleId, 5, 'Manage Trusted Domains')),
+        label: ( localize(4788, 'Manage Trusted Domains')),
         id: 'manage'
     });
     const pickedResult = await quickInputService.pick(options, { activeItem: options[0] });

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

@@ -1,13 +1,12 @@
 import { getActiveElement } from '../../../../base/browser/dom.js';
 import { UndoCommand, RedoCommand, SelectAllCommand } from '../../../../editor/browser/editorExtensions.js';
 import { CutAction, CopyAction, PasteAction } from '../../../../editor/contrib/clipboard/browser/clipboard.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IWebviewService } from './webview.service.js';
 import { WebviewInput } from '../../webviewPanel/browser/webviewEditorInput.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-const _moduleId = "vs/workbench/contrib/webview/browser/webview.contribution";
 const PRIORITY = 100;
 function overrideCommandForWebview(command, f) {
     command?.addImplementation(PRIORITY, 'webview', accessor => {
@@ -38,7 +37,7 @@ if (CutAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: CutAction.id,
-            title: ( localizeWithPath(_moduleId, 0, "Cut")),
+            title: ( localize(4375, "Cut")),
         },
         group: '5_cutcopypaste',
         order: 1,
@@ -49,7 +48,7 @@ if (CopyAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: CopyAction.id,
-            title: ( localizeWithPath(_moduleId, 1, "Copy")),
+            title: ( localize(4376, "Copy")),
         },
         group: '5_cutcopypaste',
         order: 2,
@@ -60,7 +59,7 @@ if (PasteAction) {
     MenuRegistry.appendMenuItem(MenuId.WebviewContext, {
         command: {
             id: PasteAction.id,
-            title: ( localizeWithPath(_moduleId, 2, "Paste")),
+            title: ( localize(4377, "Paste")),
         },
         group: '5_cutcopypaste',
         order: 3,

package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js

@@ -3,18 +3,37 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 class WebviewWindowDragMonitor extends Disposable {
     constructor(targetWindow, getWebview) {
         super();
-        this._register(addDisposableListener(targetWindow, EventType.DRAG_START, () => {
+        const onDragStart = () => {
             getWebview()?.windowDidDragStart();
-        }));
+        };
         const onDragEnd = () => {
             getWebview()?.windowDidDragEnd();
         };
+        this._register(addDisposableListener(targetWindow, EventType.DRAG_START, () => {
+            onDragStart();
+        }));
         this._register(addDisposableListener(targetWindow, EventType.DRAG_END, onDragEnd));
         this._register(addDisposableListener(targetWindow, EventType.MOUSE_MOVE, currentEvent => {
             if (currentEvent.buttons === 0) {
                 onDragEnd();
             }
         }));
+        this._register(addDisposableListener(targetWindow, EventType.DRAG, (event) => {
+            if (event.shiftKey) {
+                onDragEnd();
+            }
+            else {
+                onDragStart();
+            }
+        }));
+        this._register(addDisposableListener(targetWindow, EventType.DRAG_OVER, (event) => {
+            if (event.shiftKey) {
+                onDragEnd();
+            }
+            else {
+                onDragStart();
+            }
+        }));
     }
 }
 export { WebviewWindowDragMonitor };

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js

@@ -4,7 +4,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
@@ -19,10 +19,9 @@ import { IHostService } from '../../../services/host/browser/host.service.js';
 import { Parts } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 var WebviewEditor_1;
-const _moduleId = "vs/workbench/contrib/webviewPanel/browser/webviewEditor";
 const CONTEXT_ACTIVE_WEBVIEW_PANEL_ID = ( (new RawContextKey('activeWebviewPanelId', '', {
     type: 'string',
-    description: ( localizeWithPath(_moduleId, 0, "The viewType of the currently active webview panel.")),
+    description: ( localize(9513, "The viewType of the currently active webview panel.")),
 })));
 let WebviewEditor = class WebviewEditor extends EditorPane {
     static { WebviewEditor_1 = this; }

package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js

@@ -1,13 +1,8 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const _moduleId = "vs/workbench/contrib/workspace/common/workspace";
 const WorkspaceTrustContext = {
-    IsEnabled: ( (new RawContextKey('isWorkspaceTrustEnabled', false, ( localizeWithPath(_moduleId, 0, "Whether the workspace trust feature is enabled."))))),
-    IsTrusted: ( (new RawContextKey('isWorkspaceTrusted', false, ( localizeWithPath(
-     _moduleId,
-     1,
-     "Whether the current workspace has been trusted by the user."
-    )))))
+    IsEnabled: ( (new RawContextKey('isWorkspaceTrustEnabled', false, ( localize(6358, "Whether the workspace trust feature is enabled."))))),
+    IsTrusted: ( (new RawContextKey('isWorkspaceTrusted', false, ( localize(6359, "Whether the current workspace has been trusted by the user.")))))
 };
 const MANAGE_TRUST_COMMAND_ID = 'workbench.trust.manage';
 export { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext };