Merge pull request #189 from intersystems-community/#165-explorer_show_system

Show system items in ObjectScript Explorer view

Author: rajrsingh

package.json

@@ -193,6 +193,14 @@
         {
           "command": "vscode-objectscript.explorer.hideGenerated",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:generated:/"
+        },
+        {
+          "command": "vscode-objectscript.explorer.showSystem",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:(%SYS|system):).)*$/"
+        },
+        {
+          "command": "vscode-objectscript.explorer.hideSystem",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:system:/"
         }
       ],
       "editor/context": [
@@ -402,6 +410,16 @@
         "title": "Hide Generated",
         "category": "ObjectScript"
       },
+      {
+        "command": "vscode-objectscript.explorer.showSystem",
+        "title": "Show System",
+        "category": "ObjectScript"
+      },
+      {
+        "command": "vscode-objectscript.explorer.hideSystem",
+        "title": "Hide System",
+        "category": "ObjectScript"
+      },
       {
         "command": "vscode-objectscript.explorer.otherNamespaceClose",
         "title": "Close Namespace",

src/explorer/models/nodeBase.ts

@@ -1,10 +1,11 @@
 import * as vscode from "vscode";
-import { config, workspaceState } from "../../extension";
 import { currentWorkspaceFolder } from "../../utils";
+import { AtelierAPI } from "../../api";
 
 export interface NodeOptions {
   extraNode?: boolean;
   generated?: boolean;
+  system?: boolean;
   namespace?: string;
   workspaceFolder?: string;
 }
@@ -28,14 +29,14 @@ export class NodeBase {
     this.fullName = fullName;
     const { workspaceFolder, namespace, extraNode } = options;
     this.workspaceFolder = workspaceFolder || currentWorkspaceFolder();
-    this.conn = config("conn", workspaceFolder);
+    const api = new AtelierAPI(workspaceFolder);
+    this.conn = api.config;
     this.namespace = namespace || this.conn.ns;
     this.extraNode = extraNode;
   }
 
   public get connInfo(): string {
-    const port = workspaceState.get(this.workspaceFolder + ":port", this.conn.port);
-    return `${this.conn.host}:${port}[${this.namespace}]`;
+    return `${this.conn.host}:${this.conn.port}[${this.namespace}]`;
   }
 
   public getTreeItem(): vscode.TreeItem {

src/explorer/models/rootNode.ts

@@ -76,7 +76,7 @@ export class RootNode extends NodeBase {
 
     spec = path + spec;
 
-    const systemFiles = this.namespace === "%SYS" ? "1" : "0";
+    const systemFiles = this.options.system || this.namespace === "%SYS" ? "1" : "0";
 
     const api = new AtelierAPI(this.workspaceFolder);
     api.setNamespace(this.namespace);

src/explorer/models/workspaceNode.ts

@@ -9,20 +9,24 @@ export class WorkspaceNode extends NodeBase {
   public uniqueId: string;
   public constructor(label: string, eventEmitter: vscode.EventEmitter<NodeBase>, options: NodeOptions) {
     super(label, label, options);
-    this.uniqueId = `serverNode${this.extraNode ? ":extra:" + this.namespace : ""}`;
+    this.uniqueId = `serverNode:${this.namespace}:${this.extraNode ? ":extra:" : ""}`;
     this.options.generated = workspaceState.get(`ExplorerGenerated:${this.uniqueId}`);
+    this.options.system = workspaceState.get(`ExplorerSystem:${this.uniqueId}`);
     this.eventEmitter = eventEmitter;
   }
 
   public getTreeItem(): vscode.TreeItem {
+    const flags = [];
+    this.options.generated && flags.push(":generated:");
+    this.options.system && flags.push(":system:");
     return {
       collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
-      contextValue: `${this.uniqueId}${this.options.generated ? ":generated:" : ""}`,
+      contextValue: `${this.uniqueId}${flags.join("")}`,
       label: `${this.label}(${this.connInfo})`,
     };
   }
 
-  public async getChildren(element: NodeBase): Promise<NodeBase[]> {
+  public async getChildren(_element: NodeBase): Promise<NodeBase[]> {
     const children = [];
     let node: RootNode;
 

src/extension.ts

@@ -491,10 +491,18 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
       workspaceState.update(`ExplorerGenerated:${workspaceNode.uniqueId}`, true);
       return explorerProvider.refresh();
     }),
+    vscode.commands.registerCommand("vscode-objectscript.explorer.showSystem", (workspaceNode: WorkspaceNode) => {
+      workspaceState.update(`ExplorerSystem:${workspaceNode.uniqueId}`, true);
+      return explorerProvider.refresh();
+    }),
     vscode.commands.registerCommand("vscode-objectscript.explorer.hideGenerated", (workspaceNode: WorkspaceNode) => {
       workspaceState.update(`ExplorerGenerated:${workspaceNode.uniqueId}`, false);
       return explorerProvider.refresh();
     }),
+    vscode.commands.registerCommand("vscode-objectscript.explorer.hideSystem", (workspaceNode: WorkspaceNode) => {
+      workspaceState.update(`ExplorerSystem:${workspaceNode.uniqueId}`, false);
+      return explorerProvider.refresh();
+    }),
     vscode.commands.registerCommand("vscode-objectscript.explorer.otherNamespace", (workspaceNode: WorkspaceNode) => {
       return explorerProvider.selectNamespace(workspaceNode.label);
     }),