fix export issue in #18

Author: daimor

Diff for: commands/export.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import fs = require('fs');
 import path = require('path');
 import { AtelierAPI } from '../api';
-import { outputChannel, mkdirSyncRecursive } from '../utils';
+import { outputChannel, mkdirSyncRecursive, currentWorkspaceFolder } from '../utils';
 import { PackageNode } from '../explorer/models/packageNode';
 import { ClassNode } from '../explorer/models/classesNode';
 import { RoutineNode } from '../explorer/models/routineNode';
@@ -19,7 +19,7 @@ const filesFilter = (file: any) => {
 const getFileName = (folder: string, name: string, split: boolean): string => {
   let fileNameArray: string[] = name.split('.');
   let fileExt = fileNameArray.pop().toLowerCase();
-  const root = vscode.workspace.rootPath;
+  const root = [vscode.workspace.rootPath, currentWorkspaceFolder()].join(path.sep);
   const cat = fileExt === 'cls' ? 'CLS' : ['int', 'mac', 'inc'].includes(fileExt) ? 'RTN' : 'OTH';
   if (split) {
     let fileName = [root, folder, cat, ...fileNameArray].join(path.sep);
@@ -45,53 +45,58 @@ export async function exportFile(name: string, fileName: string): Promise<any> {
         const { noStorage, dontExportIfNoChanges } = config().get('export');
 
         const promise = new Promise((resolve, reject) => {
-          if(noStorage) {
+          if (noStorage) {
             // get only the storage xml for the doc.
             api.getDoc(name + '?storageOnly=1').then(storageData => {
               if (!storageData || !storageData.result) {
                 reject(new Error('Something wrong happened fetching the storage data'));
               }
               const storageContent = storageData.result.content;
-              
+
               if (storageContent.length > 1 && storageContent[0] && storageContent.length < content.length) {
-                const storageContentString = storageContent.join("\n");
-                const contentString = content.join("\n");
-                
+                const storageContentString = storageContent.join('\n');
+                const contentString = content.join('\n');
+
                 // find and replace the docs storage section with ''
-                resolve({'found': contentString.indexOf(storageContentString) >= 0,  'content': contentString.replace(storageContentString, '')});
+                resolve({
+                  found: contentString.indexOf(storageContentString) >= 0,
+                  content: contentString.replace(storageContentString, '')
+                });
               } else {
-                resolve({'found': false});
+                resolve({ found: false });
               }
             });
-          }else{
-            resolve({'found': false});
+          } else {
+            resolve({ found: false });
           }
         });
 
-        promise.then((res:any) => {
-          let joinedContent = (content || []).join("\n").toString('utf8');
-          let isSkipped = '';
-      
-          if(res.found) {
-            joinedContent = res.content.toString('utf8');
-          }
-      
-          if (dontExportIfNoChanges && fs.existsSync(fileName)) {
-            const existingContent = fs.readFileSync(fileName, "utf8");
-            // stringify to harmonise the text encoding.
-            if (JSON.stringify(joinedContent) != JSON.stringify(existingContent)) {
-              fs.writeFileSync(fileName, joinedContent);
+        promise
+          .then((res: any) => {
+            let joinedContent = (content || []).join('\n').toString('utf8');
+            let isSkipped = '';
+
+            if (res.found) {
+              joinedContent = res.content.toString('utf8');
+            }
+
+            if (dontExportIfNoChanges && fs.existsSync(fileName)) {
+              const existingContent = fs.readFileSync(fileName, 'utf8');
+              // stringify to harmonise the text encoding.
+              if (JSON.stringify(joinedContent) != JSON.stringify(existingContent)) {
+                fs.writeFileSync(fileName, joinedContent);
+              } else {
+                isSkipped = ' => skipped - no changes.';
+              }
             } else {
-              isSkipped = ' => skipped - no changes.';
+              fs.writeFileSync(fileName, joinedContent);
             }
-          } else {
-            fs.writeFileSync(fileName, joinedContent);
-          }
-          
-          log(`Success ${isSkipped}`);
-        }).catch(error => {
-          throw error;
-        });
+
+            log(`Success ${isSkipped}`);
+          })
+          .catch(error => {
+            throw error;
+          });
       });
     })
     .catch(error => {
@@ -110,7 +115,7 @@ export async function exportList(files: string[]): Promise<any> {
       maxConcurrent: maxConcurrentConnections
     });
     const results = [];
-    for (let i=0;i<files.length;i++) {
+    for (let i = 0; i < files.length; i++) {
       const result = await limiter.schedule(() => exportFile(files[i], getFileName(folder, files[i], atelier)));
       results.push(result);
     }

Diff for: package.json

@@ -378,7 +378,8 @@
         },
         "objectscript.export": {
           "type": "object",
-          "description": "Export only the necessary stuff "
+          "description": "Export only the necessary stuff ",
+          "scope": "resource"
         },
         "objectscript.export.folder": {
           "description": "folder for source code",
@@ -408,7 +409,8 @@
         "objectscript.autoCompile": {
           "description": "Autocompile on save file",
           "type": "boolean",
-          "default": false
+          "default": false,
+          "scope": "resource"
         },
         "objectscript.showExplorer": {
           "type": "boolean",