Merge branch 'master' into ViewCSPInWebview

Author: Tyler Deemer

.github/SUPPORT.md

@@ -1,7 +1,7 @@
 ## Commercial Support from CaretDev Corp
 You will get
 * Faster issue solving
-* Priority in fatures reqeuests
+* Priority in feature requests
 * On-line chat with us
 
 More [details](https://caretdev.com/visual-studio-code-objectscript-enterprise/).

.github/workflows/main.yml

@@ -1,7 +1,18 @@
 name: CI
 
-on: [push,release]
-
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '*.md'
+      - '**/*.md'
+  pull_request:
+    branches:
+      - master
+  release:
+    types:
+      - created
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -17,16 +28,21 @@ jobs:
       run: |
         set -x
         VERSION=$(jq -r '.version' package.json | cut -d- -f1)
+        [ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
         CHANGELOG=$(cat CHANGELOG.md | sed -n "/## \[${VERSION}\]/,/## /p" | sed '/^$/d;1d;$d')
         CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
         echo ::set-output name=changelog::$CHANGELOG
-        VERSION+=-beta
         git tag -l | cat
-        VERSION+=.$(($(git tag -l "v$VERSION.*" 2>/dev/null | tail -1 | cut -d. -f4)+1))
+        [ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
+        [ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev
         echo ::set-output name=version::$VERSION
-        echo ::set-output name=name::$(jq -r '.name' package.json)-$VERSION
+        NAME=$(jq -r '.name' package.json)-$VERSION
+        echo ::set-output name=name::$NAME
         tmp=$(mktemp)
         jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
+        mkdir dist
+        echo $VERSION > ./dist/.version
+        echo $NAME > ./dist/.name
     - name: Use Node.js
       uses: actions/setup-node@master
       with:
@@ -40,8 +56,28 @@ jobs:
     - name: Build package
       if: runner.os == 'Linux'
       run: |
-        mkdir dist
-        ./node_modules/.bin/vsce package -o ./dist/vscode-objectscript.vsix
+        ./node_modules/.bin/vsce package -o ./dist/package.vsix
+    - uses: actions/upload-artifact@master
+      if: runner.os == 'Linux'
+      with:
+        name: vsix
+        path: ./dist/
+  beta:
+    if: (github.event_name == 'push')
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/download-artifact@master
+      with:
+        name: vsix
+        path: ./dist/
+    - name: Set an output
+      id: set-version
+      if: runner.os == 'Linux'
+      run: |
+        set -x
+        echo ::set-output name=version::`cat ./dist/.version`
+        echo ::set-output name=name::`cat ./dist/.name`
     - name: Create Release
       id: create_release
       uses: actions/create-release@master
@@ -51,8 +87,7 @@ jobs:
       with:
         tag_name: v${{ steps.set-version.outputs.version }}
         release_name: v${{ steps.set-version.outputs.version }}
-        draft: false
-        prerelease: true
+        prerelease: ${{ github.event_name != 'release' }}
         body: |
           Changes in this release
           ${{ steps.set-version.outputs.changelog }}
@@ -64,6 +99,54 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/vscode-objectscript.vsix
+        asset_path: ./dist/package.vsix
+        asset_name: ${{ steps.set-version.outputs.name }}.vsix
+        asset_content_type: application/zip
+  publish:
+    if: github.event_name == 'release'
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: master
+    - uses: actions/download-artifact@master
+      with:
+        name: vsix
+        path: ./dist/
+    - name: Use Node.js
+      uses: actions/setup-node@master
+      with:
+        node-version: 12.x
+    - name: Prepare build
+      id: set-version
+      run: |
+        VERSION=`cat ./dist/.version`
+        echo ::set-output name=name::`cat ./dist/.name`
+        tmp=$(mktemp)
+        git config --global user.name 'ProjectBot'
+        git config --global user.email '[email protected]'
+        jq --arg version "${VERSION}-SNAPSHOT" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
+        git add package.json
+        git commit -m 'auto bump version with release'
+        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
+      if: runner.os == 'Linux'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./dist/package.vsix
         asset_name: ${{ steps.set-version.outputs.name }}.vsix
         asset_content_type: application/zip
+    - name: Publish to Marketplaces
+      run: |
+        vsce publish -p ${{ secrets.VSCE_TOKEN }}
+        ovsx publish --pat ${{ secrets.OVSX_TOKEN }}
+

CODE_OF_CONDUCT.md

@@ -0,0 +1,131 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[[email protected]].
+
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+homepage: <https://www.contributor-covenant.org>.
+
+For answers to common questions about this code of conduct, see the FAQ at
+<https://www.contributor-covenant.org/faq>. Translations are available at
+<https://www.contributor-covenant.org/translations>.
+

README.md

@@ -1,5 +1,5 @@
 [![Known Vulnerabilities](https://snyk.io/test/github/intersystems-community/vscode-objectscript/badge.svg)](https://snyk.io/test/github/intersystems-community/vscode-objectscript)
-[![Gitter](https://badges.gitter.im/intersystems-community/vscode-objectscript.svg)](https://gitter.im/intersystems-community/vscode-objectscript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/daimor.vscode-objectscript.svg)
 [![](https://img.shields.io/visual-studio-marketplace/i/daimor.vscode-objectscript.svg)](https://marketplace.visualstudio.com/items?itemName=daimor.vscode-objectscript)
 
 [![](https://img.shields.io/badge/InterSystems-IRIS-blue.svg)](https://www.intersystems.com/products/intersystems-iris/)
@@ -10,16 +10,20 @@
 
 [InterSystems](http://www.intersystems.com/our-products/) ObjectScript language support for Visual Studio Code.
 
+
 [CaretDev](https://caretdev.com/#products) provides commercial support services. [Request a Quote](https://caretdev.com/contact-us/).
 
+On-line course from CaretDev - [Developing with VSCode ObjectScript – Easy Start](https://caretdev.com/courses/).
+
+
 ## Features
 
 - InterSystems ObjectScript code highlighting support.
   ![example](https://raw.githubusercontent.com/intersystems-community/vscode-objectscript/master/images/screenshot.png)
 - Debugging ObjectScript code
-- Intellisense support for commands, system functions, class members
+- Intellisense support for commands, system functions, and class members.
 - Export existing sources to the working directory: press Cmd/Ctrl+Shift+P, type 'ObjectScript', press Enter.
-- Save and compile a class: press Ctrl+F7 (⌘+F7) or select "ObjectScript: Save and compile" from Cmd/Ctrl+Shift+P menu.
+- Save and compile a class: press <kbd>Ctrl</kbd>+<kbd>F7</kbd> (<kbd>⌘</kbd>+<kbd>F7</kbd>) or select "ObjectScript: Save and compile" from <kbd>Cmd</kbd>/<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> menu.
 - Server Explorer with possibility to export items![ServerExplorer](https://raw.githubusercontent.com/intersystems-community/vscode-objectscript/master/images/explorer.png)
 - Edit directly on server
 
@@ -33,7 +37,7 @@ Or install from ObjectScript extension page on [Visual Studio Marketplace](https
 
 ## Configure connection
 
-To be able to use many plugin features, you need to configure the connection to Caché server first. You can create or edit existing `.vscode/settings.json` file. So, your settings file may somethiing like this.
+To be able to use many plugin features, you need to configure the connection to Caché/IRIS server first. You can create or edit existing `.vscode/settings.json` file. So, your settings file may look something like this.
   ```JSON
   "objectscript.conn": {
     "active": true,
@@ -47,17 +51,17 @@ To be able to use many plugin features, you need to configure the connection to
   }
   ```
 
-Or you can edit it through settings editor. Which you can open from menu *Code* > *Preferences* > *Settings* for macOS or *File* > *Preferences* > *Settings* for Windows, search for "workspace settings" through Command Palette [⌘⇧P/Ctrl+Shift+P] or by shortcut [⌘,/Ctrl+,].
+Or you can edit it through settings editor. Which you can open from menu *Code* > *Preferences* > *Settings* for macOS or *File* > *Preferences* > *Settings* for Windows, search for "workspace settings" through Command Palette [<kbd>⌘⇧P</kbd>/<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>] or by shortcut [<kbd>⌘</kbd>+<kbd>,</kbd>/<kbd>Ctrl</kbd>+<kbd>,</kbd>].
 
 - Find a 'objectscript', do not forget to set `active` to `true`
-  `port` should follow to web port of instance (usually by default, 52773 for Caché/Ensemble, 52773 for IRIS) ![Settings UI](https://raw.githubusercontent.com/intersystems-community/vscode-objectscript/master/images/settings.png)
+  `port` should follow to web port of instance (usually by default, `57772` for Caché/Ensemble, `52773` for IRIS) ![Settings UI](https://raw.githubusercontent.com/intersystems-community/vscode-objectscript/master/images/settings.png)
 - Change settings according to your Caché/IRIS instance
 - You will see related output in "Output" while switched to "ObjectScript" channel (right drop-down menu on top of the output window)
 
 ## Notes
 
-For Caché/IRIS instance with maximum security level, add '%Development' role for '/api/atelier/' web-application ( [More](https://community.intersystems.com/post/using-atelier-rest-api) )  
-If you are getting 'ERROR #5540: SQLCODE: -99 Message: User xxx is not privileged for the operation' when you try to get/refresh class/routine/includes lists, grant a following SQL Procedure to your user on target namespace.
+For Caché/IRIS instance with maximum security level, add `%Development` role for `/api/atelier/` web-application ( [More](https://community.intersystems.com/post/using-atelier-rest-api) )
+If you are getting `ERROR #5540: SQLCODE: -99 Message: User xxx is not privileged for the operation` when you try to get/refresh class/routine/includes lists, grant a following SQL Procedure to your user on target namespace.
 ```SQL
-grant execute on %Library.RoutineMgr_StudioOpenDialog to xxx
-```
+GRANT EXECUTE ON %Library.RoutineMgr_StudioOpenDialog TO xxx
+```

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "0.8.4-SNAPSHOT",
+  "version": "0.8.7-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "7047c4a1-fc13-43ea-a485-01a74ff0b2af",
   "categories": [
@@ -442,7 +442,7 @@
       }
     ],
     "configuration": {
-      "title": "InterSystems ObjectScript Configuration",
+      "title": "InterSystems ObjectScript",
       "type": "object",
       "properties": {
         "objectscript.conn": {

src/extension.ts

@@ -48,7 +48,7 @@ import { ObjectScriptExplorerProvider } from "./explorer/explorer";
 import { WorkspaceNode } from "./explorer/models/workspaceNode";
 import { FileSystemProvider } from "./providers/FileSystemPovider/FileSystemProvider";
 import { WorkspaceSymbolProvider } from "./providers/WorkspaceSymbolProvider";
-import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker } from "./utils";
+import { currentWorkspaceFolder, outputChannel, portFromDockerCompose, terminalWithDocker, notNull } from "./utils";
 import { ObjectScriptDiagnosticProvider } from "./providers/ObjectScriptDiagnosticProvider";
 import { DocumentRangeFormattingEditProvider } from "./providers/DocumentRangeFormattingEditProvider";
 
@@ -287,12 +287,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     diagnosticProvider.updateDiagnostics(vscode.window.activeTextEditor.document);
   }
 
-  const proposed = packageJson.enableProposedApi
-    ? [
-        vscode.workspace.registerFileSearchProvider(FILESYSTEM_SCHEMA, new FileSearchProvider()),
-        vscode.workspace.registerTextSearchProvider(FILESYSTEM_SCHEMA, new TextSearchProvider()),
-      ]
-    : [];
+  const proposed = [
+    packageJson.enableProposedApi && typeof vscode.workspace.registerFileSearchProvider === "function"
+      ? vscode.workspace.registerFileSearchProvider(FILESYSTEM_SCHEMA, new FileSearchProvider())
+      : null,
+    packageJson.enableProposedApi && typeof vscode.workspace.registerTextSearchProvider === "function"
+      ? vscode.workspace.registerTextSearchProvider(FILESYSTEM_SCHEMA, new TextSearchProvider())
+      : null,
+  ].filter(notNull);
 
   context.subscriptions.push(
     reporter,