Merge pull request #23 from kwagner2853/master

Added ability to compile all classes in the current namespace

Author: daimor

api/index.ts

@@ -11,7 +11,7 @@ export class AtelierAPI {
   private _namespace: string;
   private _cache;
 
-  private get ns(): string {
+  public get ns(): string {
     return this._namespace || this._config.ns;
   }
 

commands/compile.ts

@@ -24,7 +24,7 @@ async function importFile(file: CurrentFile, flags: string): Promise<any> {
       },
       true
     )
-    .then(data => compile(file, flags))
+    .then(() => compile(file, flags))
     .catch((error: Error) => {
       outputChannel.appendLine(error.message);
       outputChannel.show(true);
@@ -73,9 +73,42 @@ export async function importAndCompile(askFLags = false): Promise<any> {
   if (!config('conn').active) {
     return;
   }
+
   const defaultFlags = config().compileFlags;
   const flags = askFLags ? await compileFlags() : defaultFlags;
   return importFile(file, flags).catch(error => {
     console.error(error);
   });
 }
+
+// Compiles all files types in the namespace
+export async function namespaceCompile(askFLags = false): Promise<any> {
+  const api = new AtelierAPI();
+  const fileTypes = ["*.CLS", "*.MAC", "*.INC", "*.BAS"]
+  if (!config('conn').active) {
+    throw new Error(`No Active Connection`);
+  }
+  const defaultFlags = config().compileFlags;
+  const flags = askFLags ? await compileFlags() : defaultFlags;
+  if (flags === undefined) {
+    // User cancelled
+    return;
+  }
+  vscode.window.withProgress({
+    location: vscode.ProgressLocation.Notification,
+    title: `Compiling Namespace: ${api.ns}`,
+    cancellable: false
+  }, async () => {
+    const data = await api
+      .actionCompile(fileTypes, flags);
+    if (data.status && data.status.errors && data.status.errors.length) {
+      console.error(data.status.summary);
+      throw new Error(`Compiling Namespace: ${api.ns} Error`);
+    }
+    else {
+      vscode.window.showInformationMessage(`Compiling Namespace: ${api.ns} Success`);
+    }
+    const file = currentFile();
+    return loadChanges(file);
+  });
+}

extension.ts

@@ -4,7 +4,7 @@ export const OBJECTSCRIPT_FILE_SCHEMA = 'objectscript';
 export const OBJECTSCRIPTXML_FILE_SCHEMA = 'objectscriptxml';
 
 import { viewOthers } from './commands/viewOthers';
-import { importAndCompile } from './commands/compile';
+import { importAndCompile, namespaceCompile } from './commands/compile';
 import { exportAll, exportExplorerItem } from './commands/export';
 import { xml2doc } from './commands/xml2doc';
 import { subclass } from './commands/subclass';
@@ -138,6 +138,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.commands.registerCommand('vscode-objectscript.compile', () => importAndCompile(false)),
     vscode.commands.registerCommand('vscode-objectscript.touchBar.compile', () => importAndCompile(false)),
     vscode.commands.registerCommand('vscode-objectscript.compileWithFlags', () => importAndCompile(true)),
+    vscode.commands.registerCommand('vscode-objectscript.compileAll', () => namespaceCompile(false)),
+    vscode.commands.registerCommand('vscode-objectscript.compileAllWithFlags', () => namespaceCompile(true)),
     vscode.commands.registerCommand('vscode-objectscript.export', exportAll),
     vscode.commands.registerCommand('vscode-objectscript.viewOthers', viewOthers),
     vscode.commands.registerCommand('vscode-objectscript.subclass', subclass),

package.json

@@ -74,6 +74,14 @@
           "command": "vscode-objectscript.compileWithFlags",
           "when": "vscode-objectscript.connectActive"
         },
+        {
+          "command": "vscode-objectscript.compileAll",
+          "when": "vscode-objectscript.connectActive"
+        },
+        {
+          "command": "vscode-objectscript.compileAllWithFlags",
+          "when": "vscode-objectscript.connectActive"
+        },
         {
           "command": "vscode-objectscript.viewOthers",
           "when": "vscode-objectscript.connectActive"
@@ -269,6 +277,16 @@
         "command": "vscode-objectscript.compileWithFlags",
         "title": "Import and compile current file with specified flags"
       },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.compileAll",
+        "title": "Compile all namespace files"
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.compileAllWithFlags",
+        "title": "Compile all namespace files with specified flags"
+      },
       {
         "command": "vscode-objectscript.explorer.showSystem",
         "title": "Show system objects",
@@ -324,6 +342,12 @@
         "mac": "Cmd+F7",
         "when": "editorLangId =~ /^objectscript/"
       },
+      {
+        "command": "vscode-objectscript.compileAll",
+        "key": "Ctrl+Shift+F7",
+        "mac": "Cmd+Shift+F7",
+        "when": "editorLangId =~ /^objectscript/"
+      },
       {
         "command": "vscode-objectscript.viewOthers",
         "key": "Ctrl+Shift+V",