@codingame/monaco-vscode-api 2.2.1 → 3.0.0

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js

@@ -8,7 +8,7 @@ import { DisposableStore, MutableDisposable, toDisposable, combinedDisposable }
 import { extUri } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import './media/breadcrumbscontrol.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { RawContextKey, ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -25,13 +25,14 @@ import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker } from './breadcrumbsPi
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { PixelRatio } from '../../../../base/browser/browser.js';
+import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 var BreadcrumbsControl_1;
 class OutlineItem extends BreadcrumbsItem {
     constructor(model, element, options) {
@@ -81,12 +82,13 @@ class OutlineItem extends BreadcrumbsItem {
     }
 }
 class FileItem extends BreadcrumbsItem {
-    constructor(model, element, options, _labels) {
+    constructor(model, element, options, _labels, _hoverDelegate) {
         super();
         this.model = model;
         this.element = element;
         this.options = options;
         this._labels = _labels;
+        this._hoverDelegate = _hoverDelegate;
         this._disposables = ( new DisposableStore());
     }
     dispose() {
@@ -101,7 +103,7 @@ class FileItem extends BreadcrumbsItem {
             this.options.showSymbolIcons === other.options.showSymbolIcons);
     }
     render(container) {
-        const label = this._labels.create(container);
+        const label = this._labels.create(container, { hoverDelegate: this._hoverDelegate });
         label.setFile(this.element.uri, {
             hidePath: true,
             hideIcon: this.element.kind === FileKind.FOLDER || !this.options.showFileIcons,
@@ -179,6 +181,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._ckBreadcrumbsPossible = BreadcrumbsControl_1.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsVisible = BreadcrumbsControl_1.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsActive = BreadcrumbsControl_1.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
+        this._hoverDelegate = nativeHoverDelegate;
         this._disposables.add(breadcrumbsService.register(this._editorGroup.id, this._widget));
         this.hide();
     }
@@ -251,7 +254,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                 showFileIcons: this._options.showFileIcons && showIcons,
                 showSymbolIcons: this._options.showSymbolIcons && showIcons
             };
-            const items = ( model.getElements().map(element => element instanceof FileElement ? ( new FileItem(model, element, options, this._labels)) : ( new OutlineItem(model, element, options))));
+            const items = ( model.getElements().map(element => element instanceof FileElement ? ( new FileItem(model, element, options, this._labels, this._hoverDelegate)) : ( new OutlineItem(model, element, options))));
             if (items.length === 0) {
                 this._widget.setEnabled(false);
                 this._widget.setItems([new (class extends BreadcrumbsItem {
@@ -341,7 +344,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                     picker = this._instantiationService.createInstance(BreadcrumbsOutlinePicker, parent, event.item.model.resource);
                 }
                 const selectListener = picker.onWillPickElement(() => this._contextViewService.hideContextView({ source: this, didPick: true }));
-                const zoomListener = PixelRatio.onDidChange(() => this._contextViewService.hideContextView({ source: this }));
+                const zoomListener = PixelRatio.getInstance(getWindow(this.domNode)).onDidChange(() => this._contextViewService.hideContextView({ source: this }));
                 const focusTracker = trackFocus(parent);
                 const blurListener = focusTracker.onDidBlur(() => {
                     this._breadcrumbsPickerIgnoreOnceItem = this._widget.isDOMFocused() ? event.item : undefined;
@@ -500,7 +503,7 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
         super({
             id: 'breadcrumbs.toggle',
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/browser/parts/editor/breadcrumbsControl',
                     'cmd.toggle',
                     "Toggle Breadcrumbs"
@@ -510,7 +513,6 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
                     { key: 'miBreadcrumbs', comment: ['&& denotes a mnemonic'] },
                     "Toggle &&Breadcrumbs"
                 )),
-                original: 'Toggle Breadcrumbs',
             },
             category: Categories.View,
             toggled: {
@@ -556,14 +558,11 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: 'breadcrumbs.focusAndSelect',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/editor/breadcrumbsControl',
-                    'cmd.focusAndSelect',
-                    "Focus and Select Breadcrumbs"
-                )),
-                original: 'Focus and Select Breadcrumbs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/breadcrumbsControl',
+                'cmd.focusAndSelect',
+                "Focus and Select Breadcrumbs"
+            )),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: 200 ,
@@ -581,14 +580,11 @@ registerAction2(class FocusBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: 'breadcrumbs.focus',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/editor/breadcrumbsControl',
-                    'cmd.focus',
-                    "Focus Breadcrumbs"
-                )),
-                original: 'Focus Breadcrumbs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/breadcrumbsControl',
+                'cmd.focus',
+                "Focus Breadcrumbs"
+            )),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: 200 ,

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js

@@ -21,6 +21,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { localizeWithPath } from '../../../../nls.js';
 import { SIDE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 let BreadcrumbsPicker = class BreadcrumbsPicker {
     constructor(parent, resource, _instantiationService, _themeService, _configurationService) {
         this.resource = resource;
@@ -157,13 +158,14 @@ FileDataSource = ( __decorate([
     ( __param(0, IFileService))
 ], FileDataSource));
 let FileRenderer = class FileRenderer {
-    constructor(_labels, _configService) {
+    constructor(_labels, _hoverDelegate, _configService) {
         this._labels = _labels;
+        this._hoverDelegate = _hoverDelegate;
         this._configService = _configService;
         this.templateId = 'FileStat';
     }
     renderTemplate(container) {
-        return this._labels.create(container, { supportHighlights: true });
+        return this._labels.create(container, { supportHighlights: true, hoverDelegate: this._hoverDelegate });
     }
     renderElement(node, index, templateData) {
         const fileDecorations = this._configService.getValue('explorer.decorations');
@@ -191,7 +193,7 @@ let FileRenderer = class FileRenderer {
     }
 };
 FileRenderer = ( __decorate([
-    ( __param(1, IConfigurationService))
+    ( __param(2, IConfigurationService))
 ], FileRenderer));
 class FileNavigationLabelProvider {
     getKeyboardNavigationLabel(element) {
@@ -292,7 +294,7 @@ let BreadcrumbsFilePicker = class BreadcrumbsFilePicker extends BreadcrumbsPicke
         onFileIconThemeChange(this._themeService.getFileIconTheme());
         const labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER );
         this._disposables.add(labels);
-        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels)], this._instantiationService.createInstance(FileDataSource), {
+        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels, nativeHoverDelegate)], this._instantiationService.createInstance(FileDataSource), {
             multipleSelectionSupport: false,
             sorter: ( new FileSorter()),
             filter: this._instantiationService.createInstance(FileFilter),

package/vscode/src/vs/workbench/browser/parts/editor/editor.autosave.contribution.js

@@ -1,4 +1,3 @@
-import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorAutoSave } from './editorAutoSave.js';
-import { Extensions } from '../../../common/contributions.js';
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(EditorAutoSave, 2 );
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, 2 );

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js

@@ -15,16 +15,18 @@ import { EditorStatusContribution, ChangeLanguageAction, ChangeEOLAction, Change
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, ReopenClosedEditorAction, ClearRecentFilesAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, NavigateForwardAction, NavigateBackwardsAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupHideSidebarAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsAction, MinimizeOtherGroupsHideSidebarAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from './editorActions.js';
+import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, NavigateBackwardsAction, NavigateForwardAction, ReopenClosedEditorAction, ClearRecentFilesAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupHideSidebarAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsAction, MinimizeOtherGroupsHideSidebarAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from './editorActions.js';
 import { setup, LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, TOGGLE_DIFF_SIDE_BY_SIDE, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, SPLIT_EDITOR, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, DIFF_SWAP_SIDES, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT } from './editorCommands.js';
 import { getQuickNavigateHandler, inQuickPickContext } from '../../quickaccess.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
 import { registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { FloatingEditorClickMenu } from '../../codeeditor.js';
-import { Extensions } from '../../../common/contributions.js';
-import { Extensions as Extensions$1 } from '../../../../platform/quickinput/common/quickAccess.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
+import { FileAccess } from '../../../../base/common/network.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from '../../../services/untitled/common/untitledTextEditorHandler.js';
@@ -64,11 +66,11 @@ import './editor.autosave.contribution.js';
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(UntitledTextEditorInput.ID, UntitledTextEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(SideBySideEditorInput.ID, SideBySideEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(DiffEditorInput.ID, DiffEditorInputSerializer);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(EditorStatusContribution, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(UntitledTextEditorWorkingCopyEditorHandler, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DynamicEditorConfigurations, 2 );
+registerWorkbenchContribution2(EditorStatusContribution.ID, EditorStatusContribution, 2 );
+registerWorkbenchContribution2(UntitledTextEditorWorkingCopyEditorHandler.ID, UntitledTextEditorWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(DynamicEditorConfigurations.ID, DynamicEditorConfigurations, 2 );
 registerEditorContribution(FloatingEditorClickMenu.ID, FloatingEditorClickMenu, 1 );
-const quickAccessRegistry = ( Registry.as(Extensions$1.Quickaccess));
+const quickAccessRegistry = ( Registry.as(Extensions.Quickaccess));
 const editorPickerContextKey = 'inEditorsPicker';
 const editorPickerContext = ( ContextKeyExpr.and(inQuickPickContext, ( ContextKeyExpr.has(editorPickerContextKey))));
 quickAccessRegistry.registerQuickAccessProvider({
@@ -246,6 +248,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     mac: { primary: 256  | 1024  | 2  }
 });
 setup();
+if (isMacintosh) {
+    MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
+        command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, icon: { dark: ( FileAccess.asFileUri('vs/workbench/browser/parts/editor/media/back-tb.png')) } },
+        group: 'navigation',
+        order: 0
+    });
+    MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
+        command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, icon: { dark: ( FileAccess.asFileUri('vs/workbench/browser/parts/editor/media/forward-tb.png')) } },
+        group: 'navigation',
+        order: 1
+    });
+}
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: LOCK_GROUP_COMMAND_ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'lockGroupAction',
@@ -791,8 +805,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_UP,
         title: {
-            original: 'Split Up',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorUpWithoutMnemonic',
                 "Split Up"
@@ -811,8 +824,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_DOWN,
         title: {
-            original: 'Split Down',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorDownWithoutMnemonic',
                 "Split Down"
@@ -821,7 +833,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] },
                 "Split &&Down"
-            ))
+            )),
         }
     },
     order: 2
@@ -831,8 +843,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_LEFT,
         title: {
-            original: 'Split Left',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorLeftWithoutMnemonic',
                 "Split Left"
@@ -841,7 +852,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] },
                 "Split &&Left"
-            ))
+            )),
         }
     },
     order: 3
@@ -851,8 +862,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_RIGHT,
         title: {
-            original: 'Split Right',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorRightWithoutMnemonic',
                 "Split Right"
@@ -861,7 +871,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] },
                 "Split &&Right"
-            ))
+            )),
         }
     },
     order: 4
@@ -871,8 +881,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_IN_GROUP,
         title: {
-            original: 'Split in Group',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorInGroupWithoutMnemonic',
                 "Split in Group"
@@ -881,7 +890,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorInGroup', comment: ['&& denotes a mnemonic'] },
                 "Split in &&Group"
-            ))
+            )),
         }
     },
     when: ActiveEditorCanSplitInGroupContext,
@@ -892,8 +901,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: JOIN_EDITOR_IN_GROUP,
         title: {
-            original: 'Join in Group',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miJoinEditorInGroupWithoutMnemonic',
                 "Join in Group"
@@ -902,7 +910,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miJoinEditorInGroup', comment: ['&& denotes a mnemonic'] },
                 "Join in &&Group"
-            ))
+            )),
         }
     },
     when: SideBySideEditorActiveContext,
@@ -913,8 +921,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
         title: {
-            original: 'Move Editor into New Window',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'moveEditorToNewWindow',
                 "Move Editor into New Window"
@@ -923,7 +930,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miMoveEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Move Editor into New Window"
-            ))
+            )),
         }
     },
     order: 1
@@ -933,8 +940,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
         title: {
-            original: 'Copy Editor into New Window',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'copyEditorToNewWindow',
                 "Copy Editor into New Window"
@@ -943,7 +949,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miCopyEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Copy Editor into New Window"
-            ))
+            )),
         }
     },
     order: 2
@@ -953,8 +959,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutSingleAction.ID,
         title: {
-            original: 'Single',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSingleColumnEditorLayoutWithoutMnemonic',
                 "Single"
@@ -963,7 +968,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Single"
-            ))
+            )),
         }
     },
     order: 1
@@ -973,8 +978,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoColumnsAction.ID,
         title: {
-            original: 'Two Columns',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoColumnsEditorLayoutWithoutMnemonic',
                 "Two Columns"
@@ -983,7 +987,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Two Columns"
-            ))
+            )),
         }
     },
     order: 3
@@ -993,8 +997,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutThreeColumnsAction.ID,
         title: {
-            original: 'Three Columns',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miThreeColumnsEditorLayoutWithoutMnemonic',
                 "Three Columns"
@@ -1003,7 +1006,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "T&&hree Columns"
-            ))
+            )),
         }
     },
     order: 4
@@ -1013,8 +1016,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoRowsAction.ID,
         title: {
-            original: 'Two Rows',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoRowsEditorLayoutWithoutMnemonic',
                 "Two Rows"
@@ -1023,7 +1025,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "T&&wo Rows"
-            ))
+            )),
         }
     },
     order: 5
@@ -1033,8 +1035,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutThreeRowsAction.ID,
         title: {
-            original: 'Three Rows',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miThreeRowsEditorLayoutWithoutMnemonic',
                 "Three Rows"
@@ -1043,7 +1044,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Three &&Rows"
-            ))
+            )),
         }
     },
     order: 6
@@ -1053,8 +1054,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoByTwoGridAction.ID,
         title: {
-            original: 'Grid (2x2)',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoByTwoGridEditorLayoutWithoutMnemonic',
                 "Grid (2x2)"
@@ -1063,7 +1063,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Grid (2x2)"
-            ))
+            )),
         }
     },
     order: 7
@@ -1073,8 +1073,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoRowsRightAction.ID,
         title: {
-            original: 'Two Rows Right',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoRowsRightEditorLayoutWithoutMnemonic',
                 "Two Rows Right"
@@ -1083,7 +1082,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Two R&&ows Right"
-            ))
+            )),
         }
     },
     order: 8
@@ -1093,8 +1092,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoColumnsBottomAction.ID,
         title: {
-            original: 'Two Columns Bottom',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoColumnsBottomEditorLayoutWithoutMnemonic',
                 "Two Columns Bottom"
@@ -1103,7 +1101,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Two &&Columns Bottom"
-            ))
+            )),
         }
     },
     order: 9