Merge branch 'master' of github.com:intersystems-community/vscode-objectscript

Author: rajrsingh

.github/workflows/main.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - master
     paths-ignore:
+      - 'docs/**'
+      - '.vscode/**'
+      - '.github/**'
       - '*.md'
       - '**/*.md'
   pull_request:
@@ -21,7 +24,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
+      with:
+        ref: master
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - name: Set an output
       id: set-version
@@ -45,7 +50,7 @@ jobs:
         echo $VERSION > ./dist/.version
         echo $NAME > ./dist/.name
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - run: npm install
@@ -61,7 +66,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         ./node_modules/.bin/vsce package -o ./dist/package.vsix
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@v2
       if: runner.os == 'Linux'
       with:
         name: vsix
@@ -71,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-    - uses: actions/download-artifact@master
+    - uses: actions/download-artifact@v2
       with:
         name: vsix
         path: ./dist/
@@ -84,7 +89,7 @@ jobs:
         echo ::set-output name=name::`cat ./dist/.name`
     - name: Create Release
       id: create_release
-      uses: actions/create-release@master
+      uses: actions/create-release@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -97,7 +102,7 @@ jobs:
           ${{ steps.set-version.outputs.changelog }}
     - name: Upload Release Asset
       id: upload-release-asset
-      uses: actions/upload-release-asset@master
+      uses: actions/upload-release-asset@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -114,12 +119,13 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: master
-    - uses: actions/download-artifact@master
+        token: ${{ secrets.TOKEN }}
+    - uses: actions/download-artifact@v2
       with:
         name: vsix
         path: ./dist/
     - name: Use Node.js
-      uses: actions/setup-node@master
+      uses: actions/setup-node@v1
       with:
         node-version: 12.x
     - name: Prepare build
@@ -137,11 +143,10 @@ jobs:
         jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
         jq '.enableProposedApi = false' package.json > "$tmp" && mv "$tmp" package.json
         npm install
-        npm i -g vsce ovsx
         git push
     - name: Upload Release Asset
       id: upload-release-asset
-      uses: actions/upload-release-asset@master
+      uses: actions/upload-release-asset@v1
       if: runner.os == 'Linux'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -152,6 +157,6 @@ jobs:
         asset_content_type: application/zip
     - name: Publish to Marketplaces
       run: |
-        vsce publish -p ${{ secrets.VSCE_TOKEN }}
-        ovsx publish --pat ${{ secrets.OVSX_TOKEN }}
+        ./node_modules/.bin/vsce publish -p ${{ secrets.VSCE_TOKEN }}
+        ./node_modules/.bin/ovsx publish --pat ${{ secrets.OVSX_TOKEN }}
 

README.md

@@ -43,14 +43,19 @@ We recommend you define server connections in the `intersystems.servers` object
 				"host": "127.0.0.1",
 				"port": 52773
 			},
-      "description": "My local IRIS",
-      "username": "me"
+      		"description": "My local IRIS",
+      		"username": "me"
 		}
   }
 ```
-Setting the `username` property is optional. If omitted it will be prompted for when connecting.
 
-By defining connections in your User Settings they become available for use by any workspace you open in VSCode.
+By defining connections in your User Settings they become available for use by any workspace you open in VSCode. Alternatively, define them in workspace-specific settings.
+
+Setting the `username` property is optional. If omitted it will be prompted for when connecting, then cached for the session..
+
+Setting a plaintext value for the `password` property is not recommended. Instead, run the `InterSystems Server Manager: Store Password in Keychain` command from Command Palette.
+
+If no password has been set or stored it will be prompted for when connecting, then cached for the session.
 
 ### Client-side Editing
 
@@ -66,7 +71,9 @@ We recommend that `objectscript.conn` uses its `server` property to point to an
   }
 ```
 
-The mandatory `ns` property defines which server namespace you will work with. If `username` is set here it overrides that setting from the `intersystems.servers` entry.
+The mandatory `ns` property defines which server namespace you will work with.
+
+When the `server` property is set, any `username` or `password` properties of `objectscript.conn` are ignored. Instead these values come from the `intersystems.servers` entry.
 
 ### Server-side Editing
 

package-lock.json

@@ -57,6 +57,7 @@
     "onCommand:vscode-objectscript.explorer.refresh",
     "onCommand:vscode-objectscript.explorer.openClass",
     "onCommand:vscode-objectscript.explorer.openRoutine",
+    "onCommand:vscode-objectscript.explorer.openCSPFile",
     "onCommand:vscode-objectscript.compileFolder",
     "onCommand:vscode-objectscript.importFolder",
     "onLanguage:objectscript",
@@ -160,11 +161,11 @@
       "view/item/context": [
         {
           "command": "vscode-objectscript.explorer.export",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:(?!(cspApplication|cspFileNode))/"
         },
         {
           "command": "vscode-objectscript.explorer.export",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataRootNode:/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataRootNode:(?!cspRootNode)/"
         },
         {
           "command": "vscode-objectscript.explorer.delete",
@@ -185,28 +186,32 @@
         {
           "command": "vscode-objectscript.explorer.otherNamespace",
           "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:extra:).)*$/",
-          "group": "inline"
+          "group": "inline@30"
         },
         {
           "command": "vscode-objectscript.explorer.otherNamespaceClose",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode:extra:/",
-          "group": "inline"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:extra:/",
+          "group": "inline@30"
         },
         {
           "command": "vscode-objectscript.explorer.showGenerated",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:generated:).)*$/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:generated:).)*$/",
+          "group": "inline@20"
         },
         {
           "command": "vscode-objectscript.explorer.hideGenerated",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:generated:/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:generated:/",
+          "group": "inline@20"
         },
         {
           "command": "vscode-objectscript.explorer.showSystem",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:(%SYS|system):).)*$/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode((?!:(%SYS|system):).)*$/",
+          "group": "inline@10"
         },
         {
           "command": "vscode-objectscript.explorer.hideSystem",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:system:/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^serverNode.*:system:/",
+          "group": "inline@10"
         }
       ],
       "editor/context": [
@@ -408,31 +413,37 @@
       {
         "command": "vscode-objectscript.explorer.otherNamespace",
         "title": "View Another Namespace...",
+        "icon": "$(add)",
         "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.showGenerated",
-        "title": "Show Generated",
+        "title": "Show Generated Items",
+        "icon": "$(server-process)",
         "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.hideGenerated",
-        "title": "Hide Generated",
+        "title": "Hide Generated Items",
+        "icon": "$(server-process)",
         "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.showSystem",
-        "title": "Show System",
+        "title": "Show System Items",
+        "icon": "$(library)",
         "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.hideSystem",
-        "title": "Hide System",
+        "title": "Hide System Items",
+        "icon": "$(library)",
         "category": "ObjectScript"
       },
       {
         "command": "vscode-objectscript.explorer.otherNamespaceClose",
         "title": "Close Namespace",
+        "icon": "$(remove)",
         "category": "ObjectScript"
       },
       {
@@ -882,6 +893,7 @@
     "minimist": ">=1.2.5",
     "mocha": "^8.0.1",
     "nock": "^13.0.0",
+    "ovsx": "latest",
     "prettier": "^2.0.5",
     "tape": "^5.0.1",
     "ts-loader": "^7.0.5",

package.json

@@ -28,7 +28,7 @@ async function compileFlags(): Promise<string> {
   });
 }
 
-export async function checkChangedOnServer(file: CurrentFile): Promise<number> {
+export async function checkChangedOnServer(file: CurrentFile, force = false): Promise<number> {
   if (!file || !file.uri || schemas.includes(file.uri.scheme)) {
     return -1;
   }
@@ -41,8 +41,11 @@ export async function checkChangedOnServer(file: CurrentFile): Promise<number> {
       .then(({ ts, content }) => {
         const fileContent = file.content.split(/\r?\n/);
         const serverTime = Number(new Date(ts + "Z"));
-        const sameContent = content.every((line, index) => line.trim() == (fileContent[index] || "").trim());
-        const mtime = sameContent ? serverTime : Math.max(Number(fs.statSync(file.fileName).mtime), serverTime);
+        const sameContent = force
+          ? false
+          : content.every((line, index) => line.trim() == (fileContent[index] || "").trim());
+        const mtime =
+          force || sameContent ? serverTime : Math.max(Number(fs.statSync(file.fileName).mtime), serverTime);
         return mtime;
       })
       .catch(() => -1));
@@ -54,6 +57,7 @@ async function importFile(file: CurrentFile, ignoreConflict?: boolean): Promise<
   const api = new AtelierAPI(file.uri);
   const content = file.content.split(/\r?\n/);
   const mtime = await checkChangedOnServer(file);
+  workspaceState.update(`${file.uniqueId}:mtime`, undefined);
   ignoreConflict = ignoreConflict || mtime < 0;
   return api
     .putDoc(
@@ -65,6 +69,9 @@ async function importFile(file: CurrentFile, ignoreConflict?: boolean): Promise<
       },
       ignoreConflict
     )
+    .then(() => {
+      checkChangedOnServer(file, true);
+    })
     .catch((error) => {
       if (error.statusCode == 400) {
         outputChannel.appendLine(error.error.result.status);

src/commands/compile.ts

@@ -24,7 +24,11 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
       .then((data) => data.result.content.namespaces)
       .then((data) => data.filter((ns) => ns !== api.ns && !extra4Workspace.includes(ns)))
       .then((data) => data.map((ns) => ({ label: ns })))
-      .then(vscode.window.showQuickPick)
+      .then((data) =>
+        vscode.window.showQuickPick(data, {
+          placeHolder: `Choose a namespace on ${api.config.host}:${api.config.port} to add to ObjectScript Explorer`,
+        })
+      )
       .then((ns) => this.showExtra4Workspace(workspaceFolder, ns.label));
   }
 
@@ -73,11 +77,14 @@ export class ObjectScriptExplorerProvider implements vscode.TreeDataProvider<Nod
         const conn: any = config("conn", workspaceFolder.name);
         if (conn.active && conn.ns) {
           const extra4Workspace = this._showExtra4Workspace[workspaceFolder.name] || [];
-          node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, {});
+          node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, {
+            workspaceFolder: workspaceFolder.name,
+          });
           rootNodes.push(node);
 
           extra4Workspace.forEach((ns) => {
             node = new WorkspaceNode(workspaceFolder.name, this._onDidChangeTreeData, {
+              workspaceFolder: workspaceFolder.name,
               namespace: ns,
               extraNode: true,
             });

src/explorer/explorer.ts

@@ -0,0 +1,25 @@
+import * as vscode from "vscode";
+import { DocumentContentProvider } from "../../providers/DocumentContentProvider";
+import { NodeBase, NodeOptions } from "./nodeBase";
+
+export class CSPFileNode extends NodeBase {
+  public static readonly contextValue: string = "dataNode:cspFileNode";
+  public constructor(label: string, fullName: string, options: NodeOptions) {
+    super(label, fullName, options);
+  }
+
+  public getTreeItem(): vscode.TreeItem {
+    const displayName: string = this.label;
+
+    return {
+      collapsibleState: vscode.TreeItemCollapsibleState.None,
+      command: {
+        arguments: [DocumentContentProvider.getUri(this.fullName, this.workspaceFolder, this.namespace)],
+        command: "vscode-objectscript.explorer.openCSPFile",
+        title: "Open File",
+      },
+      contextValue: CSPFileNode.contextValue,
+      label: `${displayName}`,
+    };
+  }
+}

src/explorer/models/cspFileNode.ts

@@ -5,6 +5,7 @@ import { PackageNode } from "./packageNode";
 import { RoutineNode } from "./routineNode";
 import { AtelierAPI } from "../../api";
 import { ClassNode } from "./classesNode";
+import { CSPFileNode } from "./cspFileNode";
 import { StudioOpenDialog } from "../../queries";
 
 export class RootNode extends NodeBase {
@@ -119,17 +120,18 @@ export class RootNode extends NodeBase {
             case "9":
               return new PackageNode(el.Name, el.fullName, category, this.options);
             case "4":
-            case "5":
             case "100":
               return new ClassNode(el.Name, el.fullName, this.options);
+            case "5":
+              return new CSPFileNode(el.Name, el.fullName, this.options);
             case "0":
             case "1":
             case "2":
             case "3":
             case "11":
               return new RoutineNode(el.Name, el.fullName, this.options);
             case "10":
-              return new RootNode(el.Name, el.fullName, "dataNode:CSPApplication", this._category, this.options, true);
+              return new RootNode(el.Name, el.fullName, "dataNode:cspApplication", this._category, this.options, true);
             default:
               return null;
           }