Replicate Studio's separate menus for Source Control vs other options

gjsjohnmurray · gjsjohnmurray · commit cec90627b85d · 2020-06-28T15:07:36.000+01:00
diff --git a/package.json b/package.json
@@ -128,11 +128,19 @@
           "when": "false"
         },
         {
-          "command": "vscode-objectscript.studio.actions",
+          "command": "vscode-objectscript.serverCommands.sourceControl",
           "when": "vscode-objectscript.connectActive && resourceScheme == isfs || vscode-objectscript.connectActive && !editorIsOpen"
         },
         {
-          "command": "vscode-objectscript.studio.contextActions",
+          "command": "vscode-objectscript.serverCommands.contextSourceControl",
+          "when": "false"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.other",
+          "when": "vscode-objectscript.connectActive && resourceScheme == isfs || vscode-objectscript.connectActive && !editorIsOpen"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.contextOther",
           "when": "false"
         }
       ],
@@ -161,7 +169,11 @@
           "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
         {
-          "command": "vscode-objectscript.studio.contextActions",
+          "command": "vscode-objectscript.serverCommands.contextSourceControl",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.contextOther",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
         {
@@ -186,27 +198,42 @@
       "editor/context": [
         {
           "command": "vscode-objectscript.viewOthers",
-          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@1"
         },
         {
           "command": "vscode-objectscript.compile",
-          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@2"
         },
         {
-          "command": "vscode-objectscript.studio.contextActions",
-          "when": "resourceScheme == isfs && editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+          "command": "vscode-objectscript.previewXml",
+          "when": "editorLangId =~ /^xml/",
+          "group": "objectscript@3"
         },
         {
-          "command": "vscode-objectscript.previewXml",
-          "when": "editorLangId =~ /^xml/"
+          "command": "vscode-objectscript.serverCommands.contextSourceControl",
+          "when": "resourceScheme == isfs && editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@4"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.contextOther",
+          "when": "resourceScheme == isfs && editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@5"
         }
       ],
       "editor/title": [
         {
-          "command": "vscode-objectscript.studio.actions",
+          "command": "vscode-objectscript.serverCommands.sourceControl",
           "group": "navigation@1",
           "when": "vscode-objectscript.connectActive && resourceScheme == isfs"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.other",
+          "group": "navigation@2",
+          "when": "vscode-objectscript.connectActive && resourceScheme == isfs"
         }
+
       ],
       "touchBar": [
         {
@@ -223,11 +250,18 @@
       "explorer/context": [
         {
           "command": "vscode-objectscript.compileFolder",
-          "when": "vscode-objectscript.connectActive"
+          "when": "vscode-objectscript.connectActive",
+          "group": "objectscript@1"
+        },
+        {
+          "command": "vscode-objectscript.serverCommands.contextSourceControl",
+          "when": "resourceScheme == isfs && resourceLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@2"
         },
         {
-          "command": "vscode-objectscript.studio.contextActions",
-          "when": "resourceScheme == isfs && resourceLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+          "command": "vscode-objectscript.serverCommands.contextOther",
+          "when": "resourceScheme == isfs && resourceLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@3"
         }
       ]
     },
@@ -420,14 +454,25 @@
       },
       {
         "category": "ObjectScript",
-        "command": "vscode-objectscript.studio.actions",
+        "command": "vscode-objectscript.serverCommands.sourceControl",
         "title": "Server Source Control...",
         "icon": "$(source-control)"
       },
       {
         "category": "ObjectScript",
-        "command": "vscode-objectscript.studio.contextActions",
+        "command": "vscode-objectscript.serverCommands.contextSourceControl",
         "title": "Server Source Control..."
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.serverCommands.other",
+        "title": "Server Command Menu...",
+        "icon": "$(server-environment)"
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.serverCommands.contextOther",
+        "title": "Server Command Menu..."
       }
     ],
     "keybindings": [
diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts
@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import { config, workspaceState, checkConnection, FILESYSTEM_SCHEMA } from "../extension";
 import { currentWorkspaceFolder, terminalWithDocker, currentFile } from "../utils";
-import { mainMenu } from "./studio";
+import { mainCommandMenu, mainSourceControlMenu } from "./studio";
 
 export async function serverActions(): Promise<void> {
   const { active, host, ns, https, port: defaultPort, username, password: defaultPassword, links } = config("conn");
@@ -49,10 +49,15 @@ export async function serverActions(): Promise<void> {
   const studio = [];
   if (!vscode.window.activeTextEditor || vscode.window.activeTextEditor.document.uri.scheme === FILESYSTEM_SCHEMA) {
     studio.push({
-      id: "studioAction",
+      id: "serverSourceControlMenu",
       label: "Server Source Control...",
       detail: "Pick server-side source control action",
     });
+    studio.push({
+      id: "serverCommandMenu",
+      label: "Server Command Menu...",
+      detail: "Pick server-side command",
+    });
   }
   return vscode.window
     .showQuickPick(
@@ -109,8 +114,12 @@ export async function serverActions(): Promise<void> {
           terminalWithDocker();
           break;
         }
-        case "studioAction": {
-          mainMenu();
+        case "serverSourceControlMenu": {
+          mainSourceControlMenu();
+          break;
+        }
+        case "serverCommandMenu": {
+          mainCommandMenu();
           break;
         }
         default: {
diff --git a/src/commands/studio.ts b/src/commands/studio.ts
@@ -21,6 +21,11 @@ export enum OtherStudioAction {
   FirstTimeDocumentSave = 7,
 }
 
+export enum StudioMenuType {
+  Main = "main",
+  Context = "context",
+}
+
 interface StudioAction extends vscode.QuickPickItem {
   name: string;
   id: string;
@@ -156,7 +161,7 @@ class StudioActions {
             });
         });
       case 3: // Run an EXE on the client.
-        throw new Error("Not suppoorted");
+        throw new Error("Not supported");
       case 4: {
         // Insert the text in Target in the current document at the current selection point
         const editor = vscode.window.activeTextEditor;
@@ -217,7 +222,7 @@ class StudioActions {
             };
           });
       default:
-        throw new Error("Not suppoorted");
+        throw new Error("Not supported");
     }
   }
 
@@ -270,9 +275,9 @@ class StudioActions {
     );
   }
 
-  private constructMenu(menu, contextMenu = false): any[] {
-    return menu
-      .filter((menuGroup) => !(contextMenu == (menuGroup.type === "main")))
+  private prepareMenuItems(menus, sourceControl: boolean): any[] {
+    return menus
+      .filter((menu) => sourceControl == (menu.id === "%SourceMenu" || menu.id === "%SourceContext"))
       .reduce(
         (list, sub) =>
           list.concat(
@@ -292,7 +297,7 @@ class StudioActions {
       );
   }
 
-  public getMenu(menuType: string, contextOnly = false): Thenable<any> {
+  public getMenu(menuType: StudioMenuType, sourceControl: boolean): Thenable<any> {
     let selectedText = "";
     const editor = vscode.window.activeTextEditor;
     if (this.uri && editor) {
@@ -306,11 +311,11 @@ class StudioActions {
     return this.api
       .actionQuery(query, parameters)
       .then((data) => data.result.content)
-      .then((menu) => this.constructMenu(menu, contextOnly))
+      .then((menus) => this.prepareMenuItems(menus, sourceControl))
       .then((menuItems) => {
         return vscode.window.showQuickPick<StudioAction>(menuItems, {
           canPickMany: false,
-          placeHolder: `Pick server-side action to perform${this.name ? " on " + this.name : ""}`,
+          placeHolder: `Pick server-side command to perform${this.name ? " on " + this.name : ""}`,
         });
       })
       .then((action) => this.userAction(action));
@@ -362,22 +367,38 @@ class StudioActions {
   }
 }
 
-export async function mainMenu(uri?: vscode.Uri): Promise<any> {
+export async function mainCommandMenu(uri?: vscode.Uri): Promise<any> {
+  return _mainMenu(false, uri);
+}
+
+export async function mainSourceControlMenu(uri?: vscode.Uri): Promise<any> {
+  return _mainMenu(true, uri);
+}
+
+async function _mainMenu(sourceControl: boolean, uri?: vscode.Uri): Promise<any> {
   uri = uri || vscode.window.activeTextEditor?.document.uri;
   if (uri && uri.scheme !== FILESYSTEM_SCHEMA) {
     return;
   }
   const studioActions = new StudioActions(uri);
-  return studioActions && studioActions.getMenu("");
+  return studioActions && studioActions.getMenu(StudioMenuType.Main, sourceControl);
+}
+
+export async function contextCommandMenu(node: PackageNode | ClassNode | RoutineNode): Promise<any> {
+  return _contextMenu(false, node);
+}
+
+export async function contextSourceControlMenu(node: PackageNode | ClassNode | RoutineNode): Promise<any> {
+  return _contextMenu(true, node);
 }
 
-export async function contextMenu(node: PackageNode | ClassNode | RoutineNode): Promise<any> {
+export async function _contextMenu(sourceControl: boolean, node: PackageNode | ClassNode | RoutineNode): Promise<any> {
   const nodeOrUri = node || vscode.window.activeTextEditor?.document.uri;
   if (!nodeOrUri || (nodeOrUri instanceof vscode.Uri && nodeOrUri.scheme !== FILESYSTEM_SCHEMA)) {
     return;
   }
   const studioActions = new StudioActions(nodeOrUri);
-  return studioActions && studioActions.getMenu("", true);
+  return studioActions && studioActions.getMenu(StudioMenuType.Context, sourceControl);
 }
 
 export async function fireOtherStudioAction(action: OtherStudioAction, uri?: vscode.Uri): Promise<void> {
diff --git a/src/extension.ts b/src/extension.ts
@@ -25,11 +25,13 @@ import { superclass } from "./commands/superclass";
 import { viewOthers } from "./commands/viewOthers";
 import { xml2doc } from "./commands/xml2doc";
 import {
-  mainMenu,
-  contextMenu,
+  mainCommandMenu,
+  contextCommandMenu,
   documentBeingProcessed,
   fireOtherStudioAction,
   OtherStudioAction,
+  contextSourceControlMenu,
+  mainSourceControlMenu,
 } from "./commands/studio";
 
 import { getLanguageConfiguration } from "./languageConfiguration";
@@ -395,8 +397,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         });
     }),
     vscode.commands.registerCommand("vscode-objectscript.viewOthers", viewOthers),
-    vscode.commands.registerCommand("vscode-objectscript.studio.actions", mainMenu),
-    vscode.commands.registerCommand("vscode-objectscript.studio.contextActions", contextMenu),
+    vscode.commands.registerCommand("vscode-objectscript.serverCommands.sourceControl", mainSourceControlMenu),
+    vscode.commands.registerCommand(
+      "vscode-objectscript.serverCommands.contextSourceControl",
+      contextSourceControlMenu
+    ),
+    vscode.commands.registerCommand("vscode-objectscript.serverCommands.other", mainCommandMenu),
+    vscode.commands.registerCommand("vscode-objectscript.serverCommands.contextOther", contextCommandMenu),
     vscode.commands.registerCommand("vscode-objectscript.subclass", subclass),
     vscode.commands.registerCommand("vscode-objectscript.superclass", superclass),
     vscode.commands.registerCommand("vscode-objectscript.serverActions", serverActions),
