compile items from Server Explorer view, resolve #69

Author: daimor

package.json

@@ -115,6 +115,10 @@
           "command": "vscode-objectscript.explorer.delete",
           "when": "false"
         },
+        {
+          "command": "vscode-objectscript.explorer.compile",
+          "when": "false"
+        },
         {
           "command": "vscode-objectscript.explorer.refresh",
           "when": "vscode-objectscript.connectActive"
@@ -148,6 +152,10 @@
           "command": "vscode-objectscript.explorer.delete",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
+        {
+          "command": "vscode-objectscript.explorer.compile",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
+        },
         {
           "command": "vscode-objectscript.explorer.otherNamespace",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:extra:).)*$/",
@@ -351,6 +359,11 @@
         "title": "Delete",
         "category": "ObjectScript"
       },
+      {
+        "command": "vscode-objectscript.explorer.compile",
+        "title": "Compile",
+        "category": "ObjectScript"
+      },
       {
         "command": "vscode-objectscript.explorer.refresh",
         "title": "Refresh Explorer",

src/commands/compile.ts

@@ -6,6 +6,10 @@ import { AtelierAPI } from "../api";
 import { config, documentContentProvider, FILESYSTEM_SCHEMA, fileSystemProvider } from "../extension";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import { currentFile, CurrentFile, outputChannel } from "../utils";
+import { RootNode } from "../explorer/models/rootNode";
+import { PackageNode } from "../explorer/models/packageNode";
+import { ClassNode } from "../explorer/models/classesNode";
+import { RoutineNode } from "../explorer/models/routineNode";
 
 async function compileFlags(): Promise<string> {
   const defaultFlags = config().compileFlags;
@@ -169,3 +173,22 @@ export async function importFolder(uri: vscode.Uri): Promise<any> {
     (error, files) => importFiles(files.map(name => path.join(folder, name)))
   );
 }
+
+export async function compileExplorerItem(node: RootNode | PackageNode | ClassNode | RoutineNode): Promise<any> {
+  const { workspaceFolder, namespace } = node;
+  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;
+    }
+  }
+  return api.actionCompile(docs, flags);
+}

src/commands/serverActions.ts

@@ -31,6 +31,9 @@ export async function serverActions(): Promise<void> {
       }
     )
     .then(action => {
+      if (!action) {
+        return;
+      }
       switch (action.id) {
         case "toggleConnection": {
           return vscode.workspace.getConfiguration().update("objectscript.conn.active", !conn.active);

src/debug/dbgp.ts

@@ -102,7 +102,6 @@ export class DbgpConnection extends EventEmitter {
             },
           },
         });
-        console.log(xml);
         const document = parser.parseFromString(xml, "application/xml");
         this.emit("message", document);
         // reset buffer

src/debug/xdebugConnection.ts

@@ -938,7 +938,6 @@ export class Connection extends DbgpConnection {
     const data = iconv.encode(commandString, ENCODING);
     this._pendingCommands.set(transactionId, command);
     this._pendingExecuteCommand = command.isExecuteCommand;
-    console.log(data.toString());
     await this.write(data);
   }
 

src/explorer/models/rootNode.ts

@@ -16,6 +16,10 @@ export class RootNode extends NodeBase {
     this._category = category;
   }
 
+  public get category(): string {
+    return this._category;
+  }
+
   public getTreeItem(): vscode.TreeItem {
     return {
       collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,

src/extension.ts

@@ -9,7 +9,12 @@ export const OBJECTSCRIPTXML_FILE_SCHEMA = "objectscriptxml";
 export const FILESYSTEM_SCHEMA = "isfs";
 export const schemas = [OBJECTSCRIPT_FILE_SCHEMA, OBJECTSCRIPTXML_FILE_SCHEMA, FILESYSTEM_SCHEMA];
 
-import { importAndCompile, importFolder as importFileOrFolder, namespaceCompile } from "./commands/compile";
+import {
+  importAndCompile,
+  importFolder as importFileOrFolder,
+  namespaceCompile,
+  compileExplorerItem,
+} from "./commands/compile";
 import { deleteItem } from "./commands/delete";
 import { exportAll, exportExplorerItem } from "./commands/export";
 import { serverActions } from "./commands/serverActions";
@@ -260,6 +265,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.commands.registerCommand("vscode-objectscript.explorer.openRoutine", vscode.window.showTextDocument),
     vscode.commands.registerCommand("vscode-objectscript.explorer.export", exportExplorerItem),
     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();

src/providers/Formatter.ts

@@ -44,6 +44,8 @@ export class Formatter {
         /** functions */
         resultValue = resultValue.replace(/\^?\$(Z+\w|\w)/i, v => v.toUpperCase());
         resultValue = resultValue.replace(/\$isobject/i, "$IsObject");
+        resultValue = resultValue.replace(/\$classmethod/i, "$ClassMethod");
+        resultValue = resultValue.replace(/\$classname/i, "$ClassName");
         break;
       }
       default: {