@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

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

@@ -1,10 +1,17 @@
+
 import { localize2 } from 'vscode/vscode/vs/nls';
+import { GroupLocation, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { Parts } from '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { Direction } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { isAuxiliaryWindow } from 'vscode/vscode/vs/base/browser/window';
 
@@ -17,79 +24,79 @@ class BaseNavigationAction extends Action2 {
         const layoutService = accessor.get(IWorkbenchLayoutService);
         const editorGroupService = accessor.get(IEditorGroupsService);
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const isEditorFocus = layoutService.hasFocus("workbench.parts.editor" );
-        const isPanelFocus = layoutService.hasFocus("workbench.parts.panel" );
-        const isSidebarFocus = layoutService.hasFocus("workbench.parts.sidebar" );
-        const isAuxiliaryBarFocus = layoutService.hasFocus("workbench.parts.auxiliarybar" );
+        const isEditorFocus = layoutService.hasFocus(Parts.EDITOR_PART);
+        const isPanelFocus = layoutService.hasFocus(Parts.PANEL_PART);
+        const isSidebarFocus = layoutService.hasFocus(Parts.SIDEBAR_PART);
+        const isAuxiliaryBarFocus = layoutService.hasFocus(Parts.AUXILIARYBAR_PART);
         let neighborPart;
         if (isEditorFocus) {
             const didNavigate = this.navigateAcrossEditorGroup(this.toGroupDirection(this.direction), editorGroupService);
             if (didNavigate) {
                 return;
             }
-            neighborPart = layoutService.getVisibleNeighborPart("workbench.parts.editor" , this.direction);
+            neighborPart = layoutService.getVisibleNeighborPart(Parts.EDITOR_PART, this.direction);
         }
         if (isPanelFocus) {
-            neighborPart = layoutService.getVisibleNeighborPart("workbench.parts.panel" , this.direction);
+            neighborPart = layoutService.getVisibleNeighborPart(Parts.PANEL_PART, this.direction);
         }
         if (isSidebarFocus) {
-            neighborPart = layoutService.getVisibleNeighborPart("workbench.parts.sidebar" , this.direction);
+            neighborPart = layoutService.getVisibleNeighborPart(Parts.SIDEBAR_PART, this.direction);
         }
         if (isAuxiliaryBarFocus) {
-            neighborPart = neighborPart = layoutService.getVisibleNeighborPart("workbench.parts.auxiliarybar" , this.direction);
+            neighborPart = neighborPart = layoutService.getVisibleNeighborPart(Parts.AUXILIARYBAR_PART, this.direction);
         }
-        if (neighborPart === "workbench.parts.editor" ) {
+        if (neighborPart === Parts.EDITOR_PART) {
             if (!this.navigateBackToEditorGroup(this.toGroupDirection(this.direction), editorGroupService)) {
-                this.navigateToEditorGroup(this.direction === 3  ? 0  : 1 , editorGroupService);
+                this.navigateToEditorGroup(this.direction === Direction.Right ? GroupLocation.FIRST : GroupLocation.LAST, editorGroupService);
             }
         }
-        else if (neighborPart === "workbench.parts.sidebar" ) {
+        else if (neighborPart === Parts.SIDEBAR_PART) {
             this.navigateToSidebar(layoutService, paneCompositeService);
         }
-        else if (neighborPart === "workbench.parts.panel" ) {
+        else if (neighborPart === Parts.PANEL_PART) {
             this.navigateToPanel(layoutService, paneCompositeService);
         }
-        else if (neighborPart === "workbench.parts.auxiliarybar" ) {
+        else if (neighborPart === Parts.AUXILIARYBAR_PART) {
             this.navigateToAuxiliaryBar(layoutService, paneCompositeService);
         }
     }
     async navigateToPanel(layoutService, paneCompositeService) {
-        if (!layoutService.isVisible("workbench.parts.panel" )) {
+        if (!layoutService.isVisible(Parts.PANEL_PART)) {
             return false;
         }
-        const activePanel = paneCompositeService.getActivePaneComposite(1 );
+        const activePanel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         if (!activePanel) {
             return false;
         }
         const activePanelId = activePanel.getId();
-        const res = await paneCompositeService.openPaneComposite(activePanelId, 1 , true);
+        const res = await paneCompositeService.openPaneComposite(activePanelId, ViewContainerLocation.Panel, true);
         if (!res) {
             return false;
         }
         return res;
     }
     async navigateToSidebar(layoutService, paneCompositeService) {
-        if (!layoutService.isVisible("workbench.parts.sidebar" )) {
+        if (!layoutService.isVisible(Parts.SIDEBAR_PART)) {
             return false;
         }
-        const activeViewlet = paneCompositeService.getActivePaneComposite(0 );
+        const activeViewlet = paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (!activeViewlet) {
             return false;
         }
         const activeViewletId = activeViewlet.getId();
-        const viewlet = await paneCompositeService.openPaneComposite(activeViewletId, 0 , true);
+        const viewlet = await paneCompositeService.openPaneComposite(activeViewletId, ViewContainerLocation.Sidebar, true);
         return !!viewlet;
     }
     async navigateToAuxiliaryBar(layoutService, paneCompositeService) {
-        if (!layoutService.isVisible("workbench.parts.auxiliarybar" )) {
+        if (!layoutService.isVisible(Parts.AUXILIARYBAR_PART)) {
             return false;
         }
-        const activePanel = paneCompositeService.getActivePaneComposite(2 );
+        const activePanel = paneCompositeService.getActivePaneComposite(ViewContainerLocation.AuxiliaryBar);
         if (!activePanel) {
             return false;
         }
         const activePanelId = activePanel.getId();
-        const res = await paneCompositeService.openPaneComposite(activePanelId, 2 , true);
+        const res = await paneCompositeService.openPaneComposite(activePanelId, ViewContainerLocation.AuxiliaryBar, true);
         if (!res) {
             return false;
         }
@@ -115,18 +122,18 @@ class BaseNavigationAction extends Action2 {
     }
     toGroupDirection(direction) {
         switch (direction) {
-            case 1 : return 1 ;
-            case 2 : return 2 ;
-            case 3 : return 3 ;
-            case 0 : return 0 ;
+            case Direction.Down: return GroupDirection.DOWN;
+            case Direction.Left: return GroupDirection.LEFT;
+            case Direction.Right: return GroupDirection.RIGHT;
+            case Direction.Up: return GroupDirection.UP;
         }
     }
     toOppositeDirection(direction) {
         switch (direction) {
-            case 0 : return 1 ;
-            case 3 : return 2 ;
-            case 2 : return 3 ;
-            case 1 : return 0 ;
+            case GroupDirection.UP: return GroupDirection.DOWN;
+            case GroupDirection.RIGHT: return GroupDirection.LEFT;
+            case GroupDirection.LEFT: return GroupDirection.RIGHT;
+            case GroupDirection.DOWN: return GroupDirection.UP;
         }
     }
     doNavigateToEditorGroup(scope, editorGroupService) {
@@ -142,40 +149,40 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateLeft',
-            title: ( localize2(4466, 'Navigate to the View on the Left')),
+            title: ( localize2(2605, 'Navigate to the View on the Left')),
             category: Categories.View,
             f1: true
-        }, 2 );
+        }, Direction.Left);
     }
 });
 registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateRight',
-            title: ( localize2(4467, 'Navigate to the View on the Right')),
+            title: ( localize2(2606, 'Navigate to the View on the Right')),
             category: Categories.View,
             f1: true
-        }, 3 );
+        }, Direction.Right);
     }
 });
 registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateUp',
-            title: ( localize2(4468, 'Navigate to the View Above')),
+            title: ( localize2(2607, 'Navigate to the View Above')),
             category: Categories.View,
             f1: true
-        }, 0 );
+        }, Direction.Up);
     }
 });
 registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateDown',
-            title: ( localize2(4469, 'Navigate to the View Below')),
+            title: ( localize2(2608, 'Navigate to the View Below')),
             category: Categories.View,
             f1: true
-        }, 1 );
+        }, Direction.Down);
     }
 });
 class BaseFocusAction extends Action2 {
@@ -194,75 +201,75 @@ class BaseFocusAction extends Action2 {
         let neighbour;
         if (windowIsAuxiliary) {
             switch (part) {
-                case "workbench.parts.editor" :
-                    neighbour = "workbench.parts.statusbar" ;
+                case Parts.EDITOR_PART:
+                    neighbour = Parts.STATUSBAR_PART;
                     break;
                 default:
-                    neighbour = "workbench.parts.editor" ;
+                    neighbour = Parts.EDITOR_PART;
             }
         }
         else {
             switch (part) {
-                case "workbench.parts.editor" :
-                    neighbour = next ? "workbench.parts.panel"  : "workbench.parts.sidebar" ;
+                case Parts.EDITOR_PART:
+                    neighbour = next ? Parts.PANEL_PART : Parts.SIDEBAR_PART;
                     break;
-                case "workbench.parts.panel" :
-                    neighbour = next ? "workbench.parts.auxiliarybar"  : "workbench.parts.editor" ;
+                case Parts.PANEL_PART:
+                    neighbour = next ? Parts.AUXILIARYBAR_PART : Parts.EDITOR_PART;
                     break;
-                case "workbench.parts.auxiliarybar" :
-                    neighbour = next ? "workbench.parts.statusbar"  : "workbench.parts.panel" ;
+                case Parts.AUXILIARYBAR_PART:
+                    neighbour = next ? Parts.STATUSBAR_PART : Parts.PANEL_PART;
                     break;
-                case "workbench.parts.statusbar" :
-                    neighbour = next ? "workbench.parts.activitybar"  : "workbench.parts.auxiliarybar" ;
+                case Parts.STATUSBAR_PART:
+                    neighbour = next ? Parts.ACTIVITYBAR_PART : Parts.AUXILIARYBAR_PART;
                     break;
-                case "workbench.parts.activitybar" :
-                    neighbour = next ? "workbench.parts.sidebar"  : "workbench.parts.statusbar" ;
+                case Parts.ACTIVITYBAR_PART:
+                    neighbour = next ? Parts.SIDEBAR_PART : Parts.STATUSBAR_PART;
                     break;
-                case "workbench.parts.sidebar" :
-                    neighbour = next ? "workbench.parts.editor"  : "workbench.parts.activitybar" ;
+                case Parts.SIDEBAR_PART:
+                    neighbour = next ? Parts.EDITOR_PART : Parts.ACTIVITYBAR_PART;
                     break;
                 default:
-                    neighbour = "workbench.parts.editor" ;
+                    neighbour = Parts.EDITOR_PART;
             }
         }
-        if (layoutService.isVisible(neighbour, activeWindow) || neighbour === "workbench.parts.editor" ) {
+        if (layoutService.isVisible(neighbour, activeWindow) || neighbour === Parts.EDITOR_PART) {
             return neighbour;
         }
         return this.findVisibleNeighbour(layoutService, neighbour, next);
     }
     focusNextOrPreviousPart(layoutService, editorService, next) {
         let currentlyFocusedPart;
-        if (editorService.activeEditorPane?.hasFocus() || layoutService.hasFocus("workbench.parts.editor" )) {
-            currentlyFocusedPart = "workbench.parts.editor" ;
+        if (editorService.activeEditorPane?.hasFocus() || layoutService.hasFocus(Parts.EDITOR_PART)) {
+            currentlyFocusedPart = Parts.EDITOR_PART;
         }
-        else if (layoutService.hasFocus("workbench.parts.activitybar" )) {
-            currentlyFocusedPart = "workbench.parts.activitybar" ;
+        else if (layoutService.hasFocus(Parts.ACTIVITYBAR_PART)) {
+            currentlyFocusedPart = Parts.ACTIVITYBAR_PART;
         }
-        else if (layoutService.hasFocus("workbench.parts.statusbar" )) {
-            currentlyFocusedPart = "workbench.parts.statusbar" ;
+        else if (layoutService.hasFocus(Parts.STATUSBAR_PART)) {
+            currentlyFocusedPart = Parts.STATUSBAR_PART;
         }
-        else if (layoutService.hasFocus("workbench.parts.sidebar" )) {
-            currentlyFocusedPart = "workbench.parts.sidebar" ;
+        else if (layoutService.hasFocus(Parts.SIDEBAR_PART)) {
+            currentlyFocusedPart = Parts.SIDEBAR_PART;
         }
-        else if (layoutService.hasFocus("workbench.parts.auxiliarybar" )) {
-            currentlyFocusedPart = "workbench.parts.auxiliarybar" ;
+        else if (layoutService.hasFocus(Parts.AUXILIARYBAR_PART)) {
+            currentlyFocusedPart = Parts.AUXILIARYBAR_PART;
         }
-        else if (layoutService.hasFocus("workbench.parts.panel" )) {
-            currentlyFocusedPart = "workbench.parts.panel" ;
+        else if (layoutService.hasFocus(Parts.PANEL_PART)) {
+            currentlyFocusedPart = Parts.PANEL_PART;
         }
-        layoutService.focusPart(currentlyFocusedPart ? this.findVisibleNeighbour(layoutService, currentlyFocusedPart, next) : "workbench.parts.editor" , getActiveWindow());
+        layoutService.focusPart(currentlyFocusedPart ? this.findVisibleNeighbour(layoutService, currentlyFocusedPart, next) : Parts.EDITOR_PART, getActiveWindow());
     }
 }
 registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusNextPart',
-            title: ( localize2(4470, 'Focus Next Part')),
+            title: ( localize2(2609, 'Focus Next Part')),
             category: Categories.View,
             f1: true,
             keybinding: {
-                primary: 64 ,
-                weight: 200
+                primary: KeyCode.F6,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         }, true);
     }
@@ -271,12 +278,12 @@ registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusPreviousPart',
-            title: ( localize2(4471, 'Focus Previous Part')),
+            title: ( localize2(2610, 'Focus Previous Part')),
             category: Categories.View,
             f1: true,
             keybinding: {
-                primary: 1024  | 64 ,
-                weight: 200
+                primary: KeyMod.Shift | KeyCode.F6,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         }, false);
     }

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.d.ts

@@ -0,0 +1 @@
+