Merge pull request #750 from isc-bsaviano/master

Fix multi-select compile and delete in ObjectScript Explorer

Author: isc-bsaviano

src/commands/compile.ts

@@ -14,10 +14,8 @@ import {
 } from "../extension";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import { currentFile, CurrentFile, currentWorkspaceFolder, outputChannel, uriOfWorkspaceFolder } from "../utils";
-import { RootNode } from "../explorer/models/rootNode";
 import { PackageNode } from "../explorer/models/packageNode";
-import { ClassNode } from "../explorer/models/classNode";
-import { RoutineNode } from "../explorer/models/routineNode";
+import { NodeBase } from "../explorer/models/nodeBase";
 
 async function compileFlags(): Promise<string> {
   const defaultFlags = config().compileFlags;
@@ -418,20 +416,24 @@ export async function importFolder(uri: vscode.Uri, noCompile = false): Promise<
   );
 }
 
-export async function compileExplorerItem(node: RootNode | PackageNode | ClassNode | RoutineNode): Promise<any> {
-  const { workspaceFolder, namespace } = node;
+export async function compileExplorerItems(nodes: NodeBase[]): Promise<any> {
+  const { workspaceFolder, namespace } = nodes[0];
   const flags = config().compileFlags;
   const api = new AtelierAPI(workspaceFolder);
   api.setNamespace(namespace);
-  let docs = [node.fullName];
-  if (node instanceof PackageNode) {
-    switch (node.category) {
-      case "RTN":
-        docs = [node.fullName + ".*.mac"];
-        break;
-      case "CLS":
-        docs = [node.fullName + ".*.cls"];
-        break;
+  const docs = [];
+  for (const node of nodes) {
+    if (node instanceof PackageNode) {
+      switch (node.category) {
+        case "RTN":
+          docs.push(node.fullName + ".*.mac");
+          break;
+        case "CLS":
+          docs.push(node.fullName + ".*.cls");
+          break;
+      }
+    } else {
+      docs.push(node.fullName);
     }
   }
   return api.actionCompile(docs, flags);

src/commands/delete.ts

@@ -1,21 +1,21 @@
 import * as vscode from "vscode";
 
 import { AtelierAPI } from "../api";
-import { ClassNode } from "../explorer/models/classNode";
 import { PackageNode } from "../explorer/models/packageNode";
 import { RootNode } from "../explorer/models/rootNode";
-import { RoutineNode } from "../explorer/models/routineNode";
+import { NodeBase } from "../explorer/models/nodeBase";
 import { explorerProvider } from "../extension";
 import { outputChannel } from "../utils";
 import { OtherStudioAction, fireOtherStudioAction } from "./studio";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 
-function deleteList(items: string[], workspaceFolder: string): Promise<any> {
+function deleteList(items: string[], workspaceFolder: string, namespace: string): Promise<any> {
   if (!items || !items.length) {
-    vscode.window.showWarningMessage("Nothing to export");
+    vscode.window.showWarningMessage("Nothing to delete");
   }
 
   const api = new AtelierAPI(workspaceFolder);
+  api.setNamespace(namespace);
   return Promise.all(items.map((item) => api.deleteDoc(item))).then((files) => {
     files.forEach((file) => {
       if (file.result.ext) {
@@ -27,18 +27,34 @@ function deleteList(items: string[], workspaceFolder: string): Promise<any> {
   });
 }
 
-export async function deleteItem(node: RootNode | PackageNode | ClassNode | RoutineNode): Promise<any> {
-  const workspaceFolder = node.workspaceFolder;
-  const nodesList = node instanceof RootNode ? node.getChildren(node) : Promise.resolve([node]);
-  return nodesList
-    .then((nodes) =>
-      nodes.reduce(
+export async function deleteExplorerItems(nodes: NodeBase[]): Promise<any> {
+  const { workspaceFolder, namespace } = nodes[0];
+  const nodesPromiseList: Promise<NodeBase[]>[] = [];
+  for (const node of nodes) {
+    nodesPromiseList.push(node instanceof RootNode ? node.getChildren(node) : Promise.resolve([node]));
+  }
+  return Promise.all(nodesPromiseList)
+    .then((nodesList) => nodesList.flat())
+    .then((allNodes) =>
+      allNodes.reduce<string[]>(
         (list, subNode) => list.concat(subNode instanceof PackageNode ? subNode.getClasses() : [subNode.fullName]),
         []
       )
     )
-    .then((items) => {
-      deleteList(items, workspaceFolder);
+    .then(async (items) => {
+      if (nodes.length > 1) {
+        // Ask the user to confirm if they're deleting more than one explorer node
+        const confirm = await vscode.window.showWarningMessage(
+          `About to delete ${items.length} documents. Are you sure you want to proceed?`,
+          "Cancel",
+          "Confirm"
+        );
+        if (confirm !== "Confirm") {
+          // Don't delete without confirmation
+          return;
+        }
+      }
+      deleteList(items, workspaceFolder, namespace);
       explorerProvider.refresh();
     });
 }

src/commands/export.ts

@@ -239,7 +239,7 @@ export async function exportAll(workspaceFolder?: string): Promise<any> {
   });
 }
 
-export async function exportExplorerItem(nodes: NodeBase[]): Promise<any> {
+export async function exportExplorerItems(nodes: NodeBase[]): Promise<any> {
   const node = nodes[0];
   const origNamespace = config("conn", node.workspaceFolder).ns;
   if (origNamespace !== node.namespace) {

src/extension.ts

@@ -22,12 +22,12 @@ import {
   importAndCompile,
   importFolder as importFileOrFolder,
   namespaceCompile,
-  compileExplorerItem,
+  compileExplorerItems,
   checkChangedOnServer,
   compileOnly,
 } from "./commands/compile";
-import { deleteItem } from "./commands/delete";
-import { exportAll, exportExplorerItem } from "./commands/export";
+import { deleteExplorerItems } from "./commands/delete";
+import { exportAll, exportExplorerItems } from "./commands/export";
 import { serverActions } from "./commands/serverActions";
 import { subclass } from "./commands/subclass";
 import { superclass } from "./commands/superclass";
@@ -841,10 +841,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     // Register the vscode-objectscript.explorer.open command elsewhere
     registerExplorerOpen(explorerProvider),
     vscode.commands.registerCommand("vscode-objectscript.explorer.export", (item, items) =>
-      exportExplorerItem(items && items.length ? items : [item])
+      exportExplorerItems(items && items.length ? items : [item])
+    ),
+    vscode.commands.registerCommand("vscode-objectscript.explorer.delete", (item, items) =>
+      deleteExplorerItems(items && items.length ? items : [item])
+    ),
+    vscode.commands.registerCommand("vscode-objectscript.explorer.compile", (item, items) =>
+      compileExplorerItems(items && items.length ? items : [item])
     ),
-    vscode.commands.registerCommand("vscode-objectscript.explorer.delete", deleteItem),
-    vscode.commands.registerCommand("vscode-objectscript.explorer.compile", compileExplorerItem),
     vscode.commands.registerCommand("vscode-objectscript.explorer.showGenerated", (workspaceNode: WorkspaceNode) => {
       workspaceState.update(`ExplorerGenerated:${workspaceNode.uniqueId}`, true);
       return explorerProvider.refresh();