@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/workbench/api/common/extHostTypes.js

@@ -765,7 +765,7 @@ let SnippetString = SnippetString_1 = class SnippetString {
         return this;
     }
     appendChoice(values, number = this._tabstop++) {
-        const value = ( values.map(s => s.replace(/\$|}|\\|,/g, '\\$&'))).join(',');
+        const value = ( values.map(s => s.replaceAll(/[|\\,]/g, '\\$&'))).join(',');
         this.value += '${';
         this.value += number;
         this.value += '|';
@@ -2695,6 +2695,11 @@ var DebugConsoleMode;
     DebugConsoleMode[DebugConsoleMode["Separate"] = 0] = "Separate";
     DebugConsoleMode[DebugConsoleMode["MergeWithParent"] = 1] = "MergeWithParent";
 })(DebugConsoleMode || (DebugConsoleMode = {})));
+class DebugVisualization {
+    constructor(name) {
+        this.name = name;
+    }
+}
 let QuickInputButtons = class QuickInputButtons {
     static { this.Back = { iconPath: ( new ThemeIcon('arrow-left')) }; }
     constructor() { }
@@ -3085,6 +3090,11 @@ class CoveredCount {
         this.total = total;
     }
 }
+const validateCC = (cc) => {
+    if (cc && cc.covered > cc.total) {
+        throw new Error(`The total number of covered items (${cc.covered}) cannot be greater than the total (${cc.total})`);
+    }
+};
 class FileCoverage {
     static fromDetails(uri, details) {
         const statements = ( new CoveredCount(0, 0));
@@ -3118,6 +3128,9 @@ class FileCoverage {
         this.statementCoverage = statementCoverage;
         this.branchCoverage = branchCoverage;
         this.functionCoverage = functionCoverage;
+        validateCC(statementCoverage);
+        validateCC(branchCoverage);
+        validateCC(functionCoverage);
     }
 }
 class StatementCoverage {
@@ -3128,9 +3141,10 @@ class StatementCoverage {
     }
 }
 class BranchCoverage {
-    constructor(executionCount, location) {
+    constructor(executionCount, location, label) {
         this.executionCount = executionCount;
         this.location = location;
+        this.label = label;
     }
 }
 class FunctionCoverage {
@@ -3234,11 +3248,11 @@ var InteractiveSessionVoteDirection;
     InteractiveSessionVoteDirection[InteractiveSessionVoteDirection["Down"] = 0] = "Down";
     InteractiveSessionVoteDirection[InteractiveSessionVoteDirection["Up"] = 1] = "Up";
 })(InteractiveSessionVoteDirection || (InteractiveSessionVoteDirection = {})));
-var InteractiveSessionCopyKind;
-( (function(InteractiveSessionCopyKind) {
-    InteractiveSessionCopyKind[InteractiveSessionCopyKind["Action"] = 1] = "Action";
-    InteractiveSessionCopyKind[InteractiveSessionCopyKind["Toolbar"] = 2] = "Toolbar";
-})(InteractiveSessionCopyKind || (InteractiveSessionCopyKind = {})));
+var ChatAgentCopyKind;
+( (function(ChatAgentCopyKind) {
+    ChatAgentCopyKind[ChatAgentCopyKind["Action"] = 1] = "Action";
+    ChatAgentCopyKind[ChatAgentCopyKind["Toolbar"] = 2] = "Toolbar";
+})(ChatAgentCopyKind || (ChatAgentCopyKind = {})));
 var ChatVariableLevel;
 ( (function(ChatVariableLevel) {
     ChatVariableLevel[ChatVariableLevel["Short"] = 1] = "Short";
@@ -3293,4 +3307,9 @@ var SpeechToTextStatus;
     SpeechToTextStatus[SpeechToTextStatus["Recognized"] = 3] = "Recognized";
     SpeechToTextStatus[SpeechToTextStatus["Stopped"] = 4] = "Stopped";
 })(SpeechToTextStatus || (SpeechToTextStatus = {})));
-export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentResultFeedbackKind, ChatEditorTabInput, ChatMessage, ChatMessageRole, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CoveredCount, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, FunctionCoverage, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionCopyKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StackFrameFocus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TestMessage, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextTabInput, ThemeColor, ThemeIcon, ThreadFocus, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId };
+var KeywordRecognitionStatus;
+( (function(KeywordRecognitionStatus) {
+    KeywordRecognitionStatus[KeywordRecognitionStatus["Recognized"] = 1] = "Recognized";
+    KeywordRecognitionStatus[KeywordRecognitionStatus["Stopped"] = 2] = "Stopped";
+})(KeywordRecognitionStatus || (KeywordRecognitionStatus = {})));
+export { BranchCoverage, Breakpoint, CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall, ChatAgentCompletionItem, ChatAgentCopyKind, ChatAgentResultFeedbackKind, ChatEditorTabInput, ChatMessage, ChatMessageRole, ChatVariableLevel, CodeAction, CodeActionKind, CodeActionTriggerKind, CodeLens, Color, ColorInformation, ColorPresentation, ColorTheme, ColorThemeKind, CommentMode, CommentState, CommentThreadCollapsibleState, CommentThreadState, CompletionItem, CompletionItemKind, CompletionItemTag, CompletionList, CompletionTriggerKind, ConfigurationTarget, CoveredCount, CustomEditorTabInput, CustomExecution, DataBreakpoint, DataTransfer, DataTransferFile, DataTransferItem, DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer, DebugConsoleMode, DebugVisualization, DecorationRangeBehavior, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Disposable, DocumentDropEdit, DocumentHighlight, DocumentHighlightKind, DocumentLink, DocumentPasteEdit, DocumentSymbol, EndOfLine, EnvironmentVariableMutatorType, EvaluatableExpression, ExtensionKind, ExtensionMode, ExtensionRuntime, ExternalUriOpenerPriority, FileChangeType, FileCoverage, FileDecoration, FileSystemError, FoldingRange, FoldingRangeKind, FunctionBreakpoint, FunctionCoverage, Hover, InlayHint, InlayHintKind, InlayHintLabelPart, InlineCompletionTriggerKind, InlineSuggestion, InlineSuggestionList, InlineValueContext, InlineValueEvaluatableExpression, InlineValueText, InlineValueVariableLookup, InputBoxValidationSeverity, InteractiveEditorResponseFeedbackKind, InteractiveSessionVoteDirection, InteractiveWindowInput, InternalDataTransferItem, InternalFileDataTransferItem, KeywordRecognitionStatus, LanguageStatusSeverity, LinkedEditingRanges, Location, ManagedResolvedAuthority, MarkdownString, MultiDocumentHighlight, NotebookCellData, NotebookCellExecutionState, NotebookCellKind, NotebookCellOutput, NotebookCellOutputItem, NotebookCellStatusBarAlignment, NotebookCellStatusBarItem, NotebookControllerAffinity, NotebookControllerAffinity2, NotebookData, NotebookDiffEditorTabInput, NotebookEdit, NotebookEditorRevealType, NotebookEditorTabInput, NotebookKernelSourceAction, NotebookRange, NotebookRendererScript, NotebookVariablesRequestKind, ParameterInformation, PortAttributes, PortAutoForwardAction, Position, ProcessExecution, ProgressLocation, QuickInputButtons, QuickPickItemKind, Range, RelatedInformationType, RelativePattern, RemoteAuthorityResolverError, ResolvedAuthority, Selection, SelectionRange, SemanticTokens, SemanticTokensBuilder, SemanticTokensEdit, SemanticTokensEdits, SemanticTokensLegend, ShellExecution, ShellQuoting, SignatureHelp, SignatureHelpTriggerKind, SignatureInformation, SnippetString, SnippetTextEdit, SourceBreakpoint, SourceControlInputBoxValidationType, SpeechToTextStatus, StackFrameFocus, StandardTokenType, StatementCoverage, StatusBarAlignment, SymbolInformation, SymbolKind, SymbolTag, SyntaxTokenType, Task, TaskGroup, TaskPanelKind, TaskRevealKind, TaskScope, TerminalEditorTabInput, TerminalExitReason, TerminalLink, TerminalLocation, TerminalOutputAnchor, TerminalProfile, TerminalQuickFixCommand, TerminalQuickFixOpener, TestMessage, TestResultState, TestRunProfileKind, TestRunRequest, TestTag, TextDiffTabInput, TextDocumentChangeReason, TextDocumentSaveReason, TextEdit, TextEditorLineNumbersStyle, TextEditorRevealType, TextEditorSelectionChangeKind, TextMergeTabInput, TextTabInput, ThemeColor, ThemeIcon, ThreadFocus, TimelineItem, TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState, TypeHierarchyItem, ViewBadge, ViewColumn, WebviewEditorTabInput, WorkspaceEdit, WorkspaceTrustState, asStatusBarItemIdentifier, setBreakpointId };

package/vscode/src/vs/workbench/api/worker/extHostConsoleForwarder.js

@@ -6,7 +6,7 @@ let ExtHostConsoleForwarder = class ExtHostConsoleForwarder extends AbstractExtH
     constructor(extHostRpc, initData) {
         super(extHostRpc, initData);
     }
-    _nativeConsoleLogMessage(method, original, args) {
+    _nativeConsoleLogMessage(_method, original, args) {
         original.apply(console, args);
     }
 };

package/vscode/src/vs/workbench/browser/actions/layoutActions.js

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../platform/actions/common/actions.js';
 import { Categories } from '../../../platform/action/common/actionCommonCategories.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
@@ -9,19 +9,21 @@ import { isWindows, isLinux, isWeb, isMacintosh, isNative } from '../../../base/
 import { IsMacNativeContext } from '../../../platform/contextkey/common/contextkeys.js';
 import { KeybindingsRegistry } from '../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
-import { ViewContainerLocationToString, IViewDescriptorService, IViewsService } from '../../common/views.js';
+import { ViewContainerLocationToString, IViewDescriptorService } from '../../common/views.js';
+import { IViewsService } from '../../services/views/common/viewsService.js';
 import { IQuickInputService } from '../../../platform/quickinput/common/quickInput.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { ToggleAuxiliaryBarAction } from '../parts/auxiliarybar/auxiliaryBarActions.js';
 import { TogglePanelAction } from '../parts/panel/panelActions.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
-import { SideBarVisibleContext, InEditorZenModeContext, IsAuxiliaryWindowFocusedContext, IsCenteredLayoutContext, MainEditorAreaVisibleContext, PanelAlignmentContext, PanelPositionContext, FocusedViewContext, AuxiliaryBarVisibleContext, PanelVisibleContext, IsFullscreenContext } from '../../common/contextkeys.js';
+import { SideBarVisibleContext, InEditorZenModeContext, IsAuxiliaryWindowFocusedContext, IsCenteredLayoutContext, MainEditorAreaVisibleContext, PanelAlignmentContext, PanelPositionContext, FocusedViewContext, AuxiliaryBarVisibleContext, PanelVisibleContext, IsMainWindowFullscreenContext } from '../../common/contextkeys.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
 import { mainWindow } from '../../../base/browser/window.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
 import { IDialogService } from '../../../platform/dialogs/common/dialogs.js';
 const menubarIcon = registerIcon('menuBar', Codicon.layoutMenubar, ( localizeWithPath(
     'vs/workbench/browser/actions/layoutActions',
@@ -107,11 +109,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.closeSidebar',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'closeSidebar',
-                "Close Primary Side Bar"
-            )), original: 'Close Primary Side Bar' },
+                'Close Primary Side Bar'
+            )),
             category: Categories.View,
             f1: true
         });
@@ -222,11 +224,11 @@ class ToggleSidebarPositionAction extends Action2 {
     constructor() {
         super({
             id: ToggleSidebarPositionAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'toggleSidebarPosition',
                 "Toggle Primary Side Bar Position"
-            )), original: 'Toggle Primary Side Bar Position' },
+            )),
             category: Categories.View,
             f1: true
         });
@@ -386,11 +388,11 @@ class ToggleSidebarVisibilityAction extends Action2 {
     constructor() {
         super({
             id: ToggleSidebarVisibilityAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'toggleSidebar',
-                "Toggle Primary Side Bar Visibility"
-            )), original: 'Toggle Primary Side Bar Visibility' },
+                'Toggle Primary Side Bar Visibility'
+            )),
             toggled: {
                 condition: SideBarVisibleContext,
                 title: ( localizeWithPath(
@@ -541,78 +543,119 @@ class ToggleStatusbarVisibilityAction extends Action2 {
     }
 }
 registerAction2(ToggleStatusbarVisibilityAction);
-class HideEditorTabsAction extends Action2 {
-    static { this.ID = 'workbench.action.hideEditorTabs'; }
-    constructor() {
+class AbstractSetShowTabsAction extends Action2 {
+    constructor(settingName, value, title, id, precondition) {
         super({
-            id: HideEditorTabsAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/actions/layoutActions',
-                    'hideEditorTabs',
-                    "Hide Editor Tabs"
-                )),
-                original: 'Hide Editor Tabs'
-            },
+            id,
+            title,
             category: Categories.View,
-            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none')).negate()), ( InEditorZenModeContext.negate()))),
+            precondition,
             f1: true
         });
+        this.settingName = settingName;
+        this.value = value;
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.showTabs', 'none');
+        return configurationService.updateValue(this.settingName, this.value);
     }
 }
-registerAction2(HideEditorTabsAction);
-class ShowMultipleEditorTabsAction extends Action2 {
+class HideEditorTabsAction extends AbstractSetShowTabsAction {
+    static { this.ID = 'workbench.action.hideEditorTabs'; }
+    constructor() {
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "none"
+        )).negate()), ( InEditorZenModeContext.negate())));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'hideEditorTabs',
+            'Hide Editor Tabs'
+        ));
+        super("workbench.editor.showTabs" , "none" , title, HideEditorTabsAction.ID, precondition);
+    }
+}
+class ZenHideEditorTabsAction extends AbstractSetShowTabsAction {
+    static { this.ID = 'workbench.action.zenHideEditorTabs'; }
+    constructor() {
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "none"
+        )).negate()), InEditorZenModeContext));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'hideEditorTabsZenMode',
+            'Hide Editor Tabs in Zen Mode'
+        ));
+        super("zenMode.showTabs" , "none" , title, ZenHideEditorTabsAction.ID, precondition);
+    }
+}
+class ShowMultipleEditorTabsAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.showMultipleEditorTabs'; }
     constructor() {
-        super({
-            id: ShowMultipleEditorTabsAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/actions/layoutActions',
-                    'showMultipleEditorTabs',
-                    "Show Multiple Editor Tabs"
-                )),
-                original: 'Show Multiple Editor Tabs'
-            },
-            category: Categories.View,
-            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'multiple')).negate()), ( InEditorZenModeContext.negate()))),
-            f1: true
-        });
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "multiple"
+        )).negate()), ( InEditorZenModeContext.negate())));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'showMultipleEditorTabs',
+            'Show Multiple Editor Tabs'
+        ));
+        super("workbench.editor.showTabs" , "multiple" , title, ShowMultipleEditorTabsAction.ID, precondition);
     }
-    run(accessor) {
-        const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.showTabs', 'multiple');
+}
+class ZenShowMultipleEditorTabsAction extends AbstractSetShowTabsAction {
+    static { this.ID = 'workbench.action.zenShowMultipleEditorTabs'; }
+    constructor() {
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "multiple"
+        )).negate()), InEditorZenModeContext));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'showMultipleEditorTabsZenMode',
+            'Show Multiple Editor Tabs in Zen Mode'
+        ));
+        super("zenMode.showTabs" , "multiple" , title, ZenShowMultipleEditorTabsAction.ID, precondition);
     }
 }
-registerAction2(ShowMultipleEditorTabsAction);
-class ShowSingleEditorTabAction extends Action2 {
+class ShowSingleEditorTabAction extends AbstractSetShowTabsAction {
     static { this.ID = 'workbench.action.showEditorTab'; }
     constructor() {
-        super({
-            id: ShowSingleEditorTabAction.ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/actions/layoutActions',
-                    'showSingleEditorTab',
-                    "Show Single Editor Tab"
-                )),
-                original: 'Show Single Editor Tab'
-            },
-            category: Categories.View,
-            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'single')).negate()), ( InEditorZenModeContext.negate()))),
-            f1: true
-        });
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"workbench.editor.showTabs" }`,
+            "single"
+        )).negate()), ( InEditorZenModeContext.negate())));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'showSingleEditorTab',
+            'Show Single Editor Tab'
+        ));
+        super("workbench.editor.showTabs" , "single" , title, ShowSingleEditorTabAction.ID, precondition);
     }
-    run(accessor) {
-        const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.showTabs', 'single');
+}
+class ZenShowSingleEditorTabAction extends AbstractSetShowTabsAction {
+    static { this.ID = 'workbench.action.zenShowEditorTab'; }
+    constructor() {
+        const precondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+            `config.${"zenMode.showTabs" }`,
+            "single"
+        )).negate()), InEditorZenModeContext));
+        const title = ( localize2WithPath(
+            'vs/workbench/browser/actions/layoutActions',
+            'showSingleEditorTabZenMode',
+            'Show Single Editor Tab in Zen Mode'
+        ));
+        super("zenMode.showTabs" , "single" , title, ZenShowSingleEditorTabAction.ID, precondition);
     }
 }
+registerAction2(HideEditorTabsAction);
+registerAction2(ZenHideEditorTabsAction);
+registerAction2(ShowMultipleEditorTabsAction);
+registerAction2(ZenShowMultipleEditorTabsAction);
 registerAction2(ShowSingleEditorTabAction);
+registerAction2(ZenShowSingleEditorTabAction);
 class EditorActionsTitleBarAction extends Action2 {
     static { this.ID = 'workbench.action.editorActionsTitleBar'; }
     constructor() {
@@ -627,13 +670,16 @@ class EditorActionsTitleBarAction extends Action2 {
                 original: 'Move Editor Actions to Title Bar'
             },
             category: Categories.View,
-            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar')).negate()), ( ( ContextKeyExpr.equals('config.window.style', 'native')).negate()))),
+            precondition: ( ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "titleBar"
+            )).negate()),
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.editorActionsLocation', 'titleBar');
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "titleBar" );
     }
 }
 registerAction2(EditorActionsTitleBarAction);
@@ -651,13 +697,19 @@ class EditorActionsDefaultAction extends Action2 {
                 original: 'Move Editor Actions to Tab Bar'
             },
             category: Categories.View,
-            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'default')).negate()), ( ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none')).negate()))),
+            precondition: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "default"
+            )).negate()), ( ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.showTabs" }`,
+                "none"
+            )).negate()))),
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.editorActionsLocation', 'default');
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "default" );
     }
 }
 registerAction2(EditorActionsDefaultAction);
@@ -675,13 +727,16 @@ class HideEditorActionsAction extends Action2 {
                 original: 'Hide Editor Actions'
             },
             category: Categories.View,
-            precondition: ( ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden')).negate()),
+            precondition: ( ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "hidden"
+            )).negate()),
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.editorActionsLocation', 'hidden');
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "hidden" );
     }
 }
 registerAction2(HideEditorActionsAction);
@@ -699,13 +754,16 @@ class ShowEditorActionsAction extends Action2 {
                 original: 'Show Editor Actions'
             },
             category: Categories.View,
-            precondition: ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden')),
+            precondition: ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.editorActionsLocation" }`,
+                "hidden"
+            )),
             f1: true
         });
     }
     run(accessor) {
         const configurationService = accessor.get(IConfigurationService);
-        return configurationService.updateValue('workbench.editor.editorActionsLocation', 'default');
+        return configurationService.updateValue("workbench.editor.editorActionsLocation" , "default" );
     }
 }
 registerAction2(ShowEditorActionsAction);
@@ -722,7 +780,10 @@ registerAction2(class extends Action2 {
                 original: 'Separate Pinned Editor Tabs'
             },
             category: Categories.View,
-            precondition: ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'multiple')),
+            precondition: ( ContextKeyExpr.equals(
+                `config.${"workbench.editor.showTabs" }`,
+                "multiple"
+            )),
             f1: true
         });
     }
@@ -1225,12 +1286,13 @@ class IncreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewSize',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'increaseViewSize',
-                "Increase Current View Size"
-            )), original: 'Increase Current View Size' },
-            f1: true
+                'Increase Current View Size'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1241,12 +1303,13 @@ class IncreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewWidth',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'increaseEditorWidth',
-                "Increase Editor Width"
-            )), original: 'Increase Editor Width' },
-            f1: true
+                'Increase Editor Width'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1257,12 +1320,13 @@ class IncreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.increaseViewHeight',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'increaseEditorHeight',
-                "Increase Editor Height"
-            )), original: 'Increase Editor Height' },
-            f1: true
+                'Increase Editor Height'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1273,12 +1337,13 @@ class DecreaseViewSizeAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewSize',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'decreaseViewSize',
-                "Decrease Current View Size"
-            )), original: 'Decrease Current View Size' },
-            f1: true
+                'Decrease Current View Size'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1289,12 +1354,13 @@ class DecreaseViewWidthAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewWidth',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'decreaseEditorWidth',
-                "Decrease Editor Width"
-            )), original: 'Decrease Editor Width' },
-            f1: true
+                'Decrease Editor Width'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1305,12 +1371,13 @@ class DecreaseViewHeightAction extends BaseResizeViewAction {
     constructor() {
         super({
             id: 'workbench.action.decreaseViewHeight',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/actions/layoutActions',
                 'decreaseEditorHeight',
-                "Decrease Editor Height"
-            )), original: 'Decrease Editor Height' },
-            f1: true
+                'Decrease Editor Height'
+            )),
+            f1: true,
+            precondition: ( IsAuxiliaryWindowFocusedContext.toNegated())
         });
     }
     run(accessor) {
@@ -1364,7 +1431,7 @@ if (!isMacintosh || !isNative) {
     ToggleVisibilityActions.push(CreateToggleLayoutItem('workbench.action.toggleMenuBar', MenuBarToggledContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'menuBar', "Menu Bar")), menubarIcon));
 }
 ToggleVisibilityActions.push(...[
-    CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ( ContextKeyExpr.equals('config.workbench.activityBar.visible', true)), ( localizeWithPath(
+    CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ( ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'hidden')), ( localizeWithPath(
         'vs/workbench/browser/actions/layoutActions',
         'activityBar',
         "Activity Bar"
@@ -1393,7 +1460,7 @@ const AlignPanelActions = [
     CreateOptionLayoutItem('workbench.action.alignPanelJustify', ( PanelAlignmentContext.isEqualTo('justify')), ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'justifyPanel', "Justify")), panelAlignmentJustifyIcon),
 ];
 const MiscLayoutOptions = [
-    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsFullscreenContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'fullscreen', "Full Screen")), fullscreenIcon),
+    CreateOptionLayoutItem('workbench.action.toggleFullScreen', IsMainWindowFullscreenContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'fullscreen', "Full Screen")), fullscreenIcon),
     CreateOptionLayoutItem('workbench.action.toggleZenMode', InEditorZenModeContext, ( localizeWithPath('vs/workbench/browser/actions/layoutActions', 'zenMode', "Zen Mode")), zenModeIcon),
     CreateOptionLayoutItem('workbench.action.toggleCenteredLayout', IsCenteredLayoutContext, ( localizeWithPath(
         'vs/workbench/browser/actions/layoutActions',
@@ -1431,7 +1498,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
             ]
         });
     }
-    getItems(contextKeyService) {
+    getItems(contextKeyService, keybindingService) {
         const toQuickPickItem = (item) => {
             const toggled = item.active.evaluate(contextKeyService.getContext(null));
             let label = item.useButtons ?
@@ -1452,6 +1519,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
                 id: item.id,
                 label,
                 ariaLabel,
+                keybinding: keybindingService.lookupKeybinding(item.id, contextKeyService),
                 buttons: !item.useButtons ? undefined : [
                     {
                         alwaysVisible: false,
@@ -1505,9 +1573,10 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         const contextKeyService = accessor.get(IContextKeyService);
         const commandService = accessor.get(ICommandService);
         const quickInputService = accessor.get(IQuickInputService);
+        const keybindingService = accessor.get(IKeybindingService);
         const quickPick = quickInputService.createQuickPick();
         this._currentQuickPick = quickPick;
-        quickPick.items = this.getItems(contextKeyService);
+        quickPick.items = this.getItems(contextKeyService, keybindingService);
         quickPick.ignoreFocusOut = true;
         quickPick.hideInput = true;
         quickPick.title = ( localizeWithPath(
@@ -1537,7 +1606,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         let selectedItem = undefined;
         disposables.add(contextKeyService.onDidChangeContext(changeEvent => {
             if (changeEvent.affectsSome(LayoutContextKeySet)) {
-                quickPick.items = this.getItems(contextKeyService);
+                quickPick.items = this.getItems(contextKeyService, keybindingService);
                 if (selectedItem) {
                     quickPick.activeItems = quickPick.items.filter(item => item.id === selectedItem?.id);
                 }
@@ -1565,7 +1634,7 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
                     const config = configurationService.inspect(id);
                     configurationService.updateValue(id, config.defaultValue);
                 };
-                resetSetting('workbench.activityBar.visible');
+                resetSetting('workbench.activityBar.location');
                 resetSetting('workbench.sideBar.location');
                 resetSetting('workbench.statusBar.visible');
                 resetSetting('workbench.panel.defaultLocation');
@@ -1585,4 +1654,4 @@ registerAction2(class CustomizeLayoutAction extends Action2 {
         quickPick.show();
     }
 });
-export { EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowEditorActionsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ToggleActivityBarVisibilityActionId, ToggleSidebarPositionAction, ToggleStatusbarVisibilityAction };
+export { EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowEditorActionsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ToggleActivityBarVisibilityActionId, ToggleSidebarPositionAction, ToggleStatusbarVisibilityAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction };