Merge pull request #152 from ty-d/AddMoreStudioActions

Add more studio actions

Author: gjsjohnmurray

package.json

@@ -156,6 +156,10 @@
           "command": "vscode-objectscript.explorer.compile",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
+        {
+          "command": "vscode-objectscript.studio.contextActions",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
+        },
         {
           "command": "vscode-objectscript.explorer.otherNamespace",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:extra:).)*$/",
@@ -407,6 +411,11 @@
         "category": "ObjectScript",
         "command": "vscode-objectscript.studio.actions",
         "title": "Studio Actions..."
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.studio.contextActions",
+        "title": "Studio Context Actions..."
       }
     ],
     "keybindings": [
@@ -612,6 +621,11 @@
           "type": "boolean",
           "default": true,
           "description": "Show `Debug this method` action for ClassMethods"
+        },
+        "objectscript.studioActionDebugOutput": {
+          "type": "boolean",
+          "default": false,
+          "description": "Output the action that VSCode should perform as requested by the server in JSON format."
         }
       }
     },

src/api/index.ts

@@ -187,10 +187,21 @@ export class AtelierAPI {
               data.result.content = Buffer.from(data.result.content.join(""), "base64");
             }
             if (data.console) {
-              outputConsole(data.console);
+              // Let studio actions handle their console output
+              const isStudioAction = data.result.content != undefined
+                && data.result.content.length !== 0
+                && data.result.content[0] != undefined
+                && data.result.content[0].action != undefined;
+              if(!isStudioAction) {
+                outputConsole(data.console);
+              }
             }
             if (data.result.status && data.result.status !== "") {
-              outputChannel.appendLine(data.result.status);
+              const status: string = data.result.status;
+              outputChannel.appendLine(status);
+              if(status.endsWith("is marked as read only by source control hooks.")) {
+                vscode.window.showWarningMessage(status, { modal: true });
+              }
               throw new Error(data.result.status);
             }
             if (data.status.summary) {

src/commands/compile.ts

@@ -38,7 +38,7 @@ function updateOthers(others: string[]) {
   });
 }
 
-async function loadChanges(files: CurrentFile[]): Promise<any> {
+export async function loadChanges(files: CurrentFile[]): Promise<any> {
   if (!files.length) {
     return;
   }
@@ -104,8 +104,8 @@ async function compile(docs: CurrentFile[], flags?: string): Promise<any> {
     .then(loadChanges);
 }
 
-export async function importAndCompile(askFLags = false): Promise<any> {
-  const file = currentFile();
+export async function importAndCompile(askFLags = false, document?: vscode.TextDocument): Promise<any> {
+  const file = currentFile(document);
   if (!file) {
     return;
   }