show/hide generated items in Explorer view

daimor · daimor · commit be32bfa43566 · 2019-10-08T17:10:42.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - When virtual filesystem `isfs://` used, now possible to execute some actions from Studio Source class menu
 - Explorer view, new way of generation, should be faster now
 - Explorer view, INC files now separate in own Includes folder
+- Explorer view, option to show/hide generated items
 
 ## [0.7.12]
 
diff --git a/package.json b/package.json
@@ -149,13 +149,21 @@
         },
         {
           "command": "vscode-objectscript.explorer.otherNamespace",
-          "when": "view == ObjectScriptExplorer && viewItem == serverNode",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:extra:).)*$/",
           "group": "inline"
         },
         {
           "command": "vscode-objectscript.explorer.otherNamespaceClose",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNodeExtra:/",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode:extra:/",
           "group": "inline"
+        },
+        {
+          "command": "vscode-objectscript.explorer.showGenerated",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:generated:).)*$/"
+        },
+        {
+          "command": "vscode-objectscript.explorer.hideGenerated",
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:generated:/"
         }
       ],
       "editor/context": [
@@ -315,22 +323,32 @@
       {
         "command": "vscode-objectscript.explorer.export",
         "title": "Export",
-        "category": "ObjecScript"
+        "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.otherNamespace",
         "title": "View another namespace",
-        "category": "ObjecScript"
+        "category": "ObjectScript"
+      },
+      {
+        "command": "vscode-objectscript.explorer.showGenerated",
+        "title": "Show generated",
+        "category": "ObjectScript"
+      },
+      {
+        "command": "vscode-objectscript.explorer.hideGenerated",
+        "title": "Hide generated",
+        "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.otherNamespaceClose",
         "title": "Close namespace",
-        "category": "ObjecScript"
+        "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.delete",
         "title": "Delete",
-        "category": "ObjecScript"
+        "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.refresh",
diff --git a/src/explorer/explorer.ts b/src/explorer/explorer.ts
@@ -65,11 +65,14 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
     workspaceFolders.forEach(workspaceFolder => {
       const conn: any = config("conn", workspaceFolder.name);
       if (conn.active && conn.ns) {
-        node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData);
+        node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, {});
         rootNodes.push(node);
 
         this._showExtra4Workspace.forEach(ns => {
-          node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, ns);
+          node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, {
+            namespace: ns,
+            extraNode: true,
+          });
           rootNodes.push(node);
         });
       }
diff --git a/src/explorer/models/classesNode.ts b/src/explorer/models/classesNode.ts
@@ -1,11 +1,11 @@
 import * as vscode from "vscode";
 import { DocumentContentProvider } from "../../providers/DocumentContentProvider";
-import { NodeBase } from "./nodeBase";
+import { NodeBase, NodeOptions } from "./nodeBase";
 
 export class ClassNode extends NodeBase {
   public static readonly contextValue: string = "dataNode:classNode";
-  public constructor(label: string, fullName: string, workspaceFolder: string, namespace: string) {
-    super(label, fullName, workspaceFolder, namespace);
+  public constructor(label: string, fullName: string, options: NodeOptions) {
+    super(label, fullName, options);
   }
 
   public getTreeItem(): vscode.TreeItem {
diff --git a/src/explorer/models/nodeBase.ts b/src/explorer/models/nodeBase.ts
@@ -1,21 +1,35 @@
 import * as vscode from "vscode";
 import { config } from "../../extension";
 
+export interface NodeOptions {
+  extraNode?: boolean;
+  generated?: boolean;
+  namespace?: string;
+  workspaceFolder?: string;
+}
+
 export class NodeBase {
+  public readonly options: NodeOptions;
   public readonly label: string;
   public readonly fullName: string;
   public readonly workspaceFolder: string;
   public readonly conn: any;
   public readonly extraNode: boolean;
   public readonly namespace: string;
 
-  protected constructor(label: string, fullName: string, workspaceFolder, namespace: string) {
+  protected constructor(label: string, fullName: string, options: NodeOptions) {
+    this.options = {
+      generated: false,
+      extraNode: false,
+      ...options,
+    };
     this.label = label;
     this.fullName = fullName;
+    const { workspaceFolder, namespace, extraNode } = options;
     this.workspaceFolder = workspaceFolder;
     this.conn = config("conn", workspaceFolder);
     this.namespace = namespace || this.conn.ns;
-    this.extraNode = this.conn.ns !== this.namespace;
+    this.extraNode = extraNode;
   }
 
   public getTreeItem(): vscode.TreeItem {
diff --git a/src/explorer/models/packageNode.ts b/src/explorer/models/packageNode.ts
@@ -2,8 +2,8 @@ import * as vscode from "vscode";
 import { RootNode } from "./rootNode";
 
 export class PackageNode extends RootNode {
-  public constructor(label: string, fullName: string, category: string, workspaceFolder: string, namespace: string) {
-    super(label, fullName, "dataNode:packageNode", category, workspaceFolder, namespace);
+  public constructor(label: string, fullName: string, category: string, options) {
+    super(label, fullName, "dataNode:packageNode", category, options);
   }
 
   public getTreeItem(): vscode.TreeItem {
diff --git a/src/explorer/models/rootNode.ts b/src/explorer/models/rootNode.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 
-import { NodeBase } from "./nodeBase";
+import { NodeBase, NodeOptions } from "./nodeBase";
 import { PackageNode } from "./packageNode";
 import { RoutineNode } from "./routineNode";
 import { AtelierAPI } from "../../api";
@@ -10,15 +10,8 @@ export class RootNode extends NodeBase {
   public readonly contextValue: string;
   private readonly _category: string;
 
-  public constructor(
-    label: string,
-    fullName: string,
-    contextValue: string,
-    category: string,
-    workspaceFolder: string,
-    namespace: string
-  ) {
-    super(label, fullName, workspaceFolder, namespace);
+  public constructor(label: string, fullName: string, contextValue: string, category: string, options: NodeOptions) {
+    super(label, fullName, options);
     this.contextValue = contextValue;
     this._category = category;
   }
@@ -56,7 +49,7 @@ export class RootNode extends NodeBase {
     const orderBy = "1"; // by Name
     const flat = "0";
     const notStudio = "0";
-    const generated = "0";
+    const generated = this.options.generated ? "1" : "0";
 
     spec = path + spec;
 
@@ -76,13 +69,13 @@ export class RootNode extends NodeBase {
             const fullName = (this instanceof PackageNode ? this.fullName + "." : "") + el.Name;
             switch (el.Type) {
               case "9":
-                return new PackageNode(el.Name, fullName, category, this.workspaceFolder, this.namespace);
+                return new PackageNode(el.Name, fullName, category, this.options);
               case "4":
-                return new ClassNode(el.Name, fullName, this.workspaceFolder, this.namespace);
+                return new ClassNode(el.Name, fullName, this.options);
               case "0":
               case "1":
               case "2":
-                return new RoutineNode(el.Name, fullName, this.workspaceFolder, this.namespace);
+                return new RoutineNode(el.Name, fullName, this.options);
               default:
                 return null;
             }
diff --git a/src/explorer/models/routineNode.ts b/src/explorer/models/routineNode.ts
@@ -1,11 +1,11 @@
 import * as vscode from "vscode";
 import { DocumentContentProvider } from "../../providers/DocumentContentProvider";
-import { NodeBase } from "./nodeBase";
+import { NodeBase, NodeOptions } from "./nodeBase";
 
 export class RoutineNode extends NodeBase {
   public static readonly contextValue: string = "dataNode:routineNode";
-  public constructor(label: string, fullName: string, workspaceFolder: string, namespace: string) {
-    super(label, fullName, workspaceFolder, namespace);
+  public constructor(label: string, fullName: string, options: NodeOptions) {
+    super(label, fullName, options);
   }
 
   public getTreeItem(): vscode.TreeItem {
diff --git a/src/explorer/models/workspaceNode.ts b/src/explorer/models/workspaceNode.ts
@@ -1,34 +1,38 @@
 import * as vscode from "vscode";
 
-import { NodeBase } from "./nodeBase";
+import { NodeBase, NodeOptions } from "./nodeBase";
 import { RootNode } from "./rootNode";
+import { workspaceState } from "../../extension";
 
 export class WorkspaceNode extends NodeBase {
   public eventEmitter: vscode.EventEmitter<NodeBase>;
-  public constructor(label: string, eventEmitter: vscode.EventEmitter<NodeBase>, namespace?: string) {
-    super(label, label, label, namespace);
+  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.options.generated = workspaceState.get(`ExplorerGenerated:${this.uniqueId}`);
     this.eventEmitter = eventEmitter;
   }
 
   public getTreeItem(): vscode.TreeItem {
     return {
       collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
-      contextValue: `serverNode${this.extraNode ? "Extra:" + this.namespace : ""}`,
-      label: `${this.label}${this.extraNode ? `[${this.namespace}]` : ""}`,
+      contextValue: `${this.uniqueId}${this.options.generated ? ":generated:" : ""}`,
+      label: `${this.label}[${this.namespace}]`,
     };
   }
 
   public async getChildren(element): Promise<NodeBase[]> {
     const children = [];
     let node: RootNode;
 
-    node = new RootNode("Classes", "", "dataRootNode:classesRootNode", "CLS", this.workspaceFolder, this.namespace);
+    node = new RootNode("Classes", "", "dataRootNode:classesRootNode", "CLS", this.options);
     children.push(node);
 
-    node = new RootNode("Routines", "", "dataRootNode:routinesRootNode", "RTN", this.workspaceFolder, this.namespace);
+    node = new RootNode("Routines", "", "dataRootNode:routinesRootNode", "RTN", this.options);
     children.push(node);
 
-    node = new RootNode("Includes", "", "dataRootNode:routinesRootNode", "INC", this.workspaceFolder, this.namespace);
+    node = new RootNode("Includes", "", "dataRootNode:routinesRootNode", "INC", this.options);
     children.push(node);
 
     return children;
diff --git a/src/extension.ts b/src/extension.ts
@@ -247,6 +247,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.commands.registerCommand("vscode-objectscript.explorer.openRoutine", vscode.window.showTextDocument),
     vscode.commands.registerCommand("vscode-objectscript.explorer.export", exportExplorerItem),
     vscode.commands.registerCommand("vscode-objectscript.explorer.delete", deleteItem),
+    vscode.commands.registerCommand("vscode-objectscript.explorer.showGenerated", (workspaceNode: WorkspaceNode) => {
+      workspaceState.update(`ExplorerGenerated:${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.otherNamespace", (workspaceNode: WorkspaceNode) => {
       return explorerProvider.selectNamespace(workspaceNode.label);
     }),

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ import * as vscode from "vscode";`
`2`	`2`	`import { RootNode } from "./rootNode";`
`3`	`3`
`4`	`4`	`export class PackageNode extends RootNode {`
`5`		`- public constructor(label: string, fullName: string, category: string, workspaceFolder: string, namespace: string) {`
`6`		`- super(label, fullName, "dataNode:packageNode", category, workspaceFolder, namespace);`
	`5`	`+ public constructor(label: string, fullName: string, category: string, options) {`
	`6`	`+ super(label, fullName, "dataNode:packageNode", category, options);`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public getTreeItem(): vscode.TreeItem {`