show system menuItem moved to serverNode in explorer

Author: daimor

Diff for: explorer/explorer.ts

@@ -9,6 +9,7 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
   private _onDidChangeTreeData: vscode.EventEmitter<NodeBase> = new vscode.EventEmitter<NodeBase>();
   readonly onDidChangeTreeData: vscode.Event<NodeBase> = this._onDidChangeTreeData.event;
   private _showSystem = false;
+  private _showSystem4Workspace: boolean[] = [];
 
   constructor() {}
 
@@ -21,6 +22,11 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
     this._onDidChangeTreeData.fire(null);
   }
 
+  showSystem4Workspace(workspaceFolder: string, value: boolean) {
+    this._showSystem4Workspace[workspaceFolder] = value;
+    this._onDidChangeTreeData.fire(null);
+  }
+
   refresh(): void {
     this._onDidChangeTreeData.fire(null);
   }
@@ -47,7 +53,7 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
         node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData);
         rootNodes.push(node);
 
-        if (this.showSystem) {
+        if (this.showSystem || this._showSystem4Workspace[workspaceFolder.name]) {
           node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, true);
           rootNodes.push(node);
         }

Diff for: explorer/models/workspaceNode.ts

@@ -8,6 +8,7 @@ import { config } from '../../extension';
 export class WorkspaceNode extends NodeBase {
   private _conn: any;
   private _namespace: string;
+  showSystem: boolean;
 
   constructor(
     public readonly label: string,
@@ -26,6 +27,7 @@ export class WorkspaceNode extends NodeBase {
   getTreeItem(): vscode.TreeItem {
     return {
       label: `${this.label}${this._showSystem ? ' - System' : ''}`,
+      contextValue: `serverNode${this._showSystem ? 'System' : ''}`,
       collapsibleState: vscode.TreeItemCollapsibleState.Expanded
     };
   }

Diff for: extension.ts

@@ -22,6 +22,7 @@ import { XmlContentProvider } from './providers/XmlContentProvider';
 import { ObjectScriptExplorerProvider } from './explorer/explorer';
 import { outputChannel, currentWorkspaceFolder } from './utils';
 import { AtelierAPI } from './api';
+import { WorkspaceNode } from './explorer/models/workspaceNode';
 export var explorerProvider: ObjectScriptExplorerProvider;
 export var documentContentProvider: DocumentContentProvider;
 export var workspaceState: vscode.Memento;
@@ -31,7 +32,9 @@ export const config = (config?: string, workspaceFolderName?: string): any => {
 
   if (['conn'].includes(config)) {
     if (workspaceFolderName !== '') {
-      const workspaceFolder = vscode.workspace.workspaceFolders.find(el => el.name === workspaceFolderName);
+      const workspaceFolder = vscode.workspace.workspaceFolders.find(
+        el => el.name.toLowerCase() === workspaceFolderName.toLowerCase()
+      );
       return vscode.workspace.getConfiguration('objectscript', workspaceFolder.uri).get(config);
     } else {
       return vscode.workspace.getConfiguration('objectscript', null).get(config);
@@ -130,13 +133,21 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     vscode.commands.registerCommand('vscode-objectscript.explorer.openClass', vscode.window.showTextDocument),
     vscode.commands.registerCommand('vscode-objectscript.explorer.openRoutine', vscode.window.showTextDocument),
     vscode.commands.registerCommand('vscode-objectscript.explorer.export', exportExplorerItem),
-    vscode.commands.registerCommand('vscode-objectscript.explorer.showSystem', () => {
-      vscode.commands.executeCommand('setContext', 'vscode-objectscript.explorer.showSystem', true);
-      explorerProvider.showSystem = true;
+    vscode.commands.registerCommand('vscode-objectscript.explorer.showSystem', (workspaceNode?: WorkspaceNode) => {
+      if (workspaceNode) {
+        explorerProvider.showSystem4Workspace(workspaceNode.label, true);
+      } else {
+        vscode.commands.executeCommand('setContext', 'vscode-objectscript.explorer.showSystem', true);
+        explorerProvider.showSystem = true;
+      }
     }),
-    vscode.commands.registerCommand('vscode-objectscript.explorer.hideSystem', () => {
-      vscode.commands.executeCommand('setContext', 'vscode-objectscript.explorer.showSystem', false);
-      explorerProvider.showSystem = false;
+    vscode.commands.registerCommand('vscode-objectscript.explorer.hideSystem', (workspaceNode?) => {
+      if (workspaceNode) {
+        explorerProvider.showSystem4Workspace(workspaceNode.label, false);
+      } else {
+        vscode.commands.executeCommand('setContext', 'vscode-objectscript.explorer.showSystem', false);
+        explorerProvider.showSystem = false;
+      }
     }),
     vscode.commands.registerCommand('vscode-objectscript.previewXml', (...args) => {
       xml2doc(context, window.activeTextEditor);

Diff for: package.json

@@ -91,14 +91,6 @@
           "command": "vscode-objectscript.explorer.refresh",
           "when": "view == ObjectScriptExplorer",
           "group": "navigation"
-        },
-        {
-          "command": "vscode-objectscript.explorer.showSystem",
-          "when": "view == ObjectScriptExplorer && !vscode-objectscript.explorer.showSystem"
-        },
-        {
-          "command": "vscode-objectscript.explorer.hideSystem",
-          "when": "view == ObjectScriptExplorer && vscode-objectscript.explorer.showSystem"
         }
       ],
       "view/item/context": [
@@ -113,6 +105,14 @@
         {
           "command": "vscode-objectscript.explorer.export",
           "when": "view == ObjectScriptExplorer && viewItem == routineNode"
+        },
+        {
+          "command": "vscode-objectscript.explorer.showSystem",
+          "when": "view == ObjectScriptExplorer && viewItem == serverNode"
+        },
+        {
+          "command": "vscode-objectscript.explorer.hideSystem",
+          "when": "view == ObjectScriptExplorer && viewItem == serverNodeSystem"
         }
       ],
       "editor/context": [

Diff for: utils/index.ts

@@ -85,5 +85,5 @@ export function currentWorkspaceFolder(): string {
 }
 
 export function workspaceFolderUri(workspaceFolder: string): vscode.Uri {
-  return vscode.workspace.workspaceFolders.find(el => el.name === workspaceFolder).uri;
+  return vscode.workspace.workspaceFolders.find(el => el.name.toLowerCase() === workspaceFolder.toLowerCase()).uri;
 }