some small fixes

Author: daimor

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Improvements in Server Explorer build tree.
 - Fixed memory leak when exporting large amount of files.
 - Some other fixes
+- Server view can be opened in explorer as virtual file system with schema `isfs://`
 
 ## [0.7.11]
 

api/index.ts

@@ -179,6 +179,10 @@ export class AtelierAPI {
           } else {
             return data;
           }
+        })
+        .catch((error) => {
+          console.error(error);
+          throw error;
         });
     });
   }

commands/compile.ts

@@ -43,7 +43,7 @@ async function loadChanges(files: CurrentFile[]): Promise<any> {
         .then((data) => {
           const content = (data.result.content || []).join("\n");
           if (file.uri.scheme === "file") {
-            fs.writeFileSync(file.uri.toString(), content);
+            fs.writeFileSync(file.fileName, content);
           } else if (file.uri.scheme === FILESYSTEM_SCHEMA) {
             fileSystemProvider.writeFile(file.uri, Buffer.from(content), { overwrite: true, create: false });
           }

commands/export.ts

@@ -129,9 +129,7 @@ export async function exportList(files: string[], workspaceFolder: string): Prom
       outputChannel.appendLine(`Items failed to export: \n${errors.join("\n")}`);
     }
   };
-  return run(files).then(() => {
-    outputChannel.appendLine("finish1");
-  });
+  return run(files);
 }
 
 export async function exportAll(workspaceFolder?: string): Promise<any> {
@@ -140,7 +138,8 @@ export async function exportAll(workspaceFolder?: string): Promise<any> {
       .filter((folder) => config("conn", folder.name).active)
       .map((el) => el.name);
     if (list.length > 1) {
-      return vscode.window.showQuickPick(list).then(exportAll);
+      return vscode.window.showQuickPick(list)
+        .then((folder) => folder ? exportAll : null);
     } else {
       workspaceFolder = list.pop();
     }

package.json

@@ -39,20 +39,21 @@
   },
   "activationEvents": [
     "workspaceContains:*.cls",
-    "onFileSystem:isfs",
+    "workspaceContains:*.mac",
     "onCommand:vscode-objectscript.export",
     "onCommand:vscode-objectscript.compile",
     "onCommand:vscode-objectscript.viewOthers",
     "onCommand:vscode-objectscript.previewXml",
     "onCommand:vscode-objectscript.explorer.refresh",
     "onCommand:vscode-objectscript.explorer.openClass",
     "onCommand:vscode-objectscript.explorer.openRoutine",
-    "onCommand:vscode-objectscript.explorer.hideSystem",
+    "onCommand:vscode-objectscript.compileFolder",
     "onLanguage:objectscript",
     "onLanguage:objectscript-class",
     "onLanguage:objectscript-macros",
     "onLanguage:xml",
     "onView:ObjectScriptExplorer",
+    "onFileSystem:isfs",
     "onFileSystem:objectscript",
     "onDebugInitialConfigurations"
   ],
@@ -70,11 +71,11 @@
         },
         {
           "command": "vscode-objectscript.compile",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.compileWithFlags",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.compileAll",
@@ -86,39 +87,35 @@
         },
         {
           "command": "vscode-objectscript.viewOthers",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.subclass",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.superclass",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.previewXml",
-          "when": "vscode-objectscript.connectActive"
+          "when": "editorLangId = xml && vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.explorer.export",
-          "when": "true"
+          "when": "vscode-objectscript.connectActive"
         },
         {
           "command": "vscode-objectscript.explorer.delete",
           "when": "false"
         },
         {
           "command": "vscode-objectscript.explorer.refresh",
-          "when": "true"
-        },
-        {
-          "command": "vscode-objectscript.explorer.showSystem",
-          "when": "true"
+          "when": "vscode-objectscript.connectActive"
         },
         {
-          "command": "vscode-objectscript.explorer.hideSystem",
-          "when": "true"
+          "command": "vscode-objectscript.compileFolder",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -141,14 +138,6 @@
           "command": "vscode-objectscript.explorer.delete",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
-        {
-          "command": "vscode-objectscript.explorer.showSystem",
-          "when": "view == ObjectScriptExplorer && viewItem == serverNode"
-        },
-        {
-          "command": "vscode-objectscript.explorer.hideSystem",
-          "when": "view == ObjectScriptExplorer && viewItem == serverNodeSystem"
-        },
         {
           "command": "vscode-objectscript.explorer.otherNamespace",
           "when": "view == ObjectScriptExplorer && viewItem == serverNode",
@@ -309,16 +298,6 @@
         "command": "vscode-objectscript.compileAllWithFlags",
         "title": "Compile all namespace files with specified flags"
       },
-      {
-        "command": "vscode-objectscript.explorer.showSystem",
-        "title": "Show system objects",
-        "category": "ObjecScript"
-      },
-      {
-        "command": "vscode-objectscript.explorer.hideSystem",
-        "title": "Hide system objects",
-        "category": "ObjecScript"
-      },
       {
         "command": "vscode-objectscript.explorer.export",
         "title": "Export",

providers/ObjectScriptCompletionItemProvider.ts

@@ -323,11 +323,11 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
       className = text.split(" ").pop();
     }
     // tslint:disable-next-line: max-line-length
-    pattern = /(?:(Extends |CompileAfter *=|DependsOn *=|PropertyClass *=) *\(? *)((%?[a-zA-Z][a-zA-Z0-9]*(?:\.[a-zA-Z][a-zA-Z0-9]*)*)(, *%?[a-zA-Z][a-zA-Z0-9]*(?:\.[a-zA-Z][a-zA-Z0-9]*)*|, *)*.?)?/i;
+    pattern = /(?:(Extends |CompileAfter *=|DependsOn *=|PropertyClass *=) *\(? *)((%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*)(, *%?[a-zA-Z0-9]*(?:\.[a-zA-Z0-9]*)*|, *)*.?)?/i;
     if ((!range)
       // && (!document.getWordRangeAtPosition(position, /\bExtends\b\s*/i))
       && document.getWordRangeAtPosition(position, pattern)) {
-      range = document.getWordRangeAtPosition(position, /%?[a-zA-Z][a-zA-Z0-9.]*/)
+      range = document.getWordRangeAtPosition(position, /%?[a-zA-Z][a-zA-Z0-9.]*|%/)
         || new vscode.Range(position, position);
       text = document.getText(range);
       className = text.split(/\s|\(/).pop();
@@ -396,12 +396,16 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
       const api = new AtelierAPI();
       return api.actionQuery(sql, params).then((data) => {
         return data.result.content
+          .map((el) => ({
+            ...el,
+            AsPackage: (el.AsPackage === "1"),
+          }))
           .map((el) => ({
             command: el.AsPackage ? { title: "", command: "editor.action.triggerSuggest" } : null,
             insertText: new vscode.SnippetString(el.PartName + (el.AsPackage ? "." : "")),
             kind: el.AsPackage ? vscode.CompletionItemKind.Folder : vscode.CompletionItemKind.Class,
             label: el.PartName,
-            range: document.getWordRangeAtPosition(position, /%?\b[a-zA-Z][a-zA-Z0-9]*\b/),
+            range: document.getWordRangeAtPosition(position, /%?\b[a-zA-Z][a-zA-Z0-9]*\b|%/),
             sortText: el.Priority + el.PartName + (el.AsPackage ? "0" : "1"),
           }));
       });