Merge remote-tracking branch 'upstream/master' into fix-233

Author: gjsjohnmurray

.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

@@ -893,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

@@ -77,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

@@ -388,9 +388,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   });
   toCheck.forEach(async function (uri, configName) {
     if (serverManagerApi && serverManagerApi.getServerSpec) {
-      const connSpec = await serverManagerApi.getServerSpec(configName);
-      if (connSpec) {
-        resolvedConnSpecs.set(configName, connSpec);
+      const serverName = uri.scheme === "file" ? config("conn", configName).server : configName;
+      if (serverName && serverName !== "" && !resolvedConnSpecs.has(serverName)) {
+        const connSpec = await serverManagerApi.getServerSpec(serverName);
+        if (connSpec) {
+          resolvedConnSpecs.set(serverName, connSpec);
+        }
       }
     }
     checkConnection(true, uri);

src/extension.ts

@@ -2,7 +2,7 @@ import * as vscode from "vscode";
 
 import { AtelierAPI } from "../api/index";
 import { ClassDefinition } from "../utils/classDefinition";
-import { currentFile, onlyUnique } from "../utils/index";
+import { currentFile, onlyUnique, notNull } from "../utils/index";
 import commands = require("./completion/commands.json");
 import structuredSystemVariables = require("./completion/structuredSystemVariables.json");
 import systemFunctions = require("./completion/systemFunctions.json");
@@ -40,17 +40,19 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
         );
       }
     }
-    const completions =
-      this.classes(document, position, token, context) ||
-      this.macrolist(document, position, token, context) ||
-      this.dollarsComplete(document, position) ||
-      this.commands(document, position) ||
-      this.entities(document, position, token, context) ||
-      this.macro(document, position, token, context) ||
-      this.constants(document, position, token, context) ||
-      null;
+    const completions = []
+      .concat(
+        this.classes(document, position, token, context),
+        this.macrolist(document, position, token, context),
+        this.dollarsComplete(document, position),
+        this.commands(document, position),
+        this.entities(document, position, token, context),
+        this.macro(document, position, token, context),
+        this.constants(document, position, token, context)
+      )
+      .filter(notNull);
 
-    return completions;
+    return Promise.all(completions).then((data) => data.flatMap((el) => el.items || el));
   }
 
   public macro(

src/providers/ObjectScriptCompletionItemProvider.ts

@@ -43,17 +43,21 @@ export function currentFile(document?: vscode.TextDocument): CurrentFile {
   if (!document) {
     return null;
   }
+  const fileName = document.fileName;
+  const fileExt = fileName.split(".").pop().toLowerCase();
   if (
     !schemas.includes(document.uri.scheme) &&
-    (!document || !document.fileName || !document.languageId || !document.languageId.startsWith("objectscript"))
+    (!document ||
+      !document.fileName ||
+      !document.languageId ||
+      !document.languageId.startsWith("objectscript") ||
+      fileExt.match(/(csp)/i)) // Skip CSP for now, yet
   ) {
     return null;
   }
   const eol = document.eol || vscode.EndOfLine.LF;
   const uri = document.uri;
-  const fileName = document.fileName;
   const content = document.getText();
-  const fileExt = fileName.split(".").pop().toLowerCase();
   let name = "";
   let ext = "";
   const { query } = url.parse(decodeURIComponent(uri.toString()), true);