Merge pull request #208 from intersystems-community/import-folder

Import folder only, without compilation from files explorer

Author: rajrsingh

package.json

@@ -58,6 +58,7 @@
     "onCommand:vscode-objectscript.explorer.openClass",
     "onCommand:vscode-objectscript.explorer.openRoutine",
     "onCommand:vscode-objectscript.compileFolder",
+    "onCommand:vscode-objectscript.importFolder",
     "onLanguage:objectscript",
     "onLanguage:objectscript-class",
     "onLanguage:objectscript-macros",
@@ -262,7 +263,12 @@
       "explorer/context": [
         {
           "command": "vscode-objectscript.compileFolder",
-          "when": "vscode-objectscript.connectActive",
+          "when": "vscode-objectscript.connectActive && resourceScheme == file",
+          "group": "objectscript@1"
+        },
+        {
+          "command": "vscode-objectscript.importFolder",
+          "when": "vscode-objectscript.connectActive && resourceScheme == file",
           "group": "objectscript@1"
         },
         {
@@ -478,6 +484,11 @@
         "command": "vscode-objectscript.compileFolder",
         "title": "Import and Compile"
       },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.importFolder",
+        "title": "Import without Compilation"
+      },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.serverCommands.sourceControl",

src/commands/compile.ts

@@ -242,7 +242,7 @@ export async function namespaceCompile(askFLags = false): Promise<any> {
   );
 }
 
-function importFiles(files) {
+function importFiles(files, noCompile = false) {
   return Promise.all<CurrentFile>(
     files.map((file) =>
       vscode.workspace
@@ -255,13 +255,13 @@ function importFiles(files) {
           })
         )
     )
-  ).then(compile);
+  ).then(noCompile ? Promise.resolve : compile);
 }
 
-export async function importFolder(uri: vscode.Uri): Promise<any> {
+export async function importFolder(uri: vscode.Uri, noCompile = false): Promise<any> {
   const folder = uri.fsPath;
   if (fs.lstatSync(folder).isFile()) {
-    return importFiles([folder]);
+    return importFiles([folder], noCompile);
   }
   glob(
     "*.{cls,inc,mac,int}",
@@ -270,7 +270,11 @@ export async function importFolder(uri: vscode.Uri): Promise<any> {
       matchBase: true,
       nocase: true,
     },
-    (error, files) => importFiles(files.map((name) => path.join(folder, name)))
+    (_error, files) =>
+      importFiles(
+        files.map((name) => path.join(folder, name)),
+        noCompile
+      )
   );
 }
 

src/extension.ts

@@ -440,7 +440,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     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.compileFolder", importFileOrFolder),
+    vscode.commands.registerCommand("vscode-objectscript.compileFolder", (_file, files) =>
+      Promise.all(files.map((file) => importFileOrFolder(file, false)))
+    ),
+    vscode.commands.registerCommand("vscode-objectscript.importFolder", (_file, files) =>
+      Promise.all(files.map((file) => importFileOrFolder(file, true)))
+    ),
     vscode.commands.registerCommand("vscode-objectscript.export", exportAll),
     vscode.commands.registerCommand("vscode-objectscript.debug", (program: string, askArgs: boolean) => {
       const startDebugging = (args) => {