Merge branch 'master' into server-manager-edits

Author: isc-rsingh

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [1.0.11] 12-May-2021
+- Support client-side web app (CSP) workflow as long as web app path is in the `/csp/*` space (#147, #449)
+- Add compile-only commands 'Compile Current File' and 'Compile Current File with Specified Flags...' (#595)
+- Add 'Edit Other' command plus menu option below 'View Other' (#309)
+- Report server-side errors from imports and isfs saves (#391)
+- Use web app token when authenticating with Management Portal and Class Reference.
+- Permit empty argument list in 'Debug this' (#642)
+- Add `objectscript.compileOnSave` setting to turn off post-save compile (#594)
+- Treat `system=1` parameter on non-%SYS `isfs` folder spec as signal to include %-items (#623)
+- Add `objectscript.multilineMethodArgs` setting to use UDL parameter supported on servers with API version 4+ (#457)
+- Add snippets for business processes.
+- Prevent leading space in front of Class keyword from blocking import (#613)
+- Import into the correct namespace when working with multi-root workspace (#535)
+- Refactor 'Jump to Line' to use DocumentSymbolProvider.
+- Improve 'View Other' when working with servers supporting API version 4+ (#363)
+- Support Language Server enhancement that opens local copy of file when using 'Go to Definition' in client-side editing mode.
+- Update connections when settings are changed (#608)
+- Improve documentation.
+- Upgrade vulnerable dependencies.
+
 ## [1.0.10] 26-Apr-2021
 - Avoid prompting for already-saved password (#61)
 - Constrain QuickOpen list contents when `isfs` folder path targets a specific package (#581)
@@ -35,7 +55,7 @@
 ## [1.0.7] 4-Jan-2021
 - Fix issue affecting use with Docker on Windows (#516)
 - Resolve problem debugging in a multi-root workspace using isfs (#387)
-- Allow 'View other' from custom Studio documents.
+- Allow 'View Other' from custom Studio documents.
 - Fix issue that prevented saving of custom Studio documents.
 - Add code snippets for Request, Response and multi-superclass class definitions, Projection, XData, Try Catch, $$$ThrowOnError macro.
 - Upgrade vulnerable dependency.

README.md

@@ -12,7 +12,7 @@
 
 - Documentation on [GitHub Pages](https://intersystems-community.github.io/vscode-objectscript/).
 
-- Guidance on [reporting issues](https://community.intersystems.com/post/using-intersystems-objectscript-vs-code-how-report-issues).
+- Guidance on [reporting issues](https://community.intersystems.com/post/using-intersystems-objectscript-vs-code-how-report-issues). This guidance also appears in a later section of this document.
 
 ## Features
 
@@ -38,10 +38,11 @@
 
 Install [Visual Studio Code](https://code.visualstudio.com/) first.
 
-Open VS Code. Go to Extensions view (<kbd>⌘</kbd>/<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd>), search for "vscode-objectscript" and install it.
-Or install direct from the ObjectScript extension page on [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=intersystems-community.vscode-objectscript).
+Then to get a set of extensions that collaborate to bring you a great ObjectScript development experience, install the [InterSystems ObjectScript Extension Pack](https://marketplace.visualstudio.com/items?itemName=intersystems-community.objectscript-pack).
 
-![installation](https://raw.githubusercontent.com/intersystems-community/vscode-objectscript/master/images/installation.gif)
+When you install an extension pack VS Code installs any of its members that you don't already have. Then if you ever need to switch off all of those extensions (for example, in a VS Code workspace on a non-ObjectScript project) simply disable the extension pack at the desired level. Member extensions can still be managed individually.
+
+Open VS Code. Go to Extensions view (<kbd>⌘</kbd>/<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd>), use the search string **@id:intersystems-community.objectscript-pack** and install it.
 
 ## Enable Proposed APIs
 
@@ -55,8 +56,8 @@ To unlock these features (optional):
 
 1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
 	- Go to https://github.com/intersystems-community/vscode-objectscript/releases
-	- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.0.10`, look for `1.0.11-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
-	- Download the VSIX file (for example `vscode-objectscript-1.0.11-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
+	- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `1.0.11`, look for `1.0.12-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
+	- Download the VSIX file (for example `vscode-objectscript-1.0.12-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code.
 
 2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
 3. In the argv.json file that opens, add this line:
@@ -107,6 +108,47 @@ To edit code directly in one or more namespaces on one or more servers (local or
 
 For more about `isfs` and `isfs-readonly` folder specifications see the [Notes](#Notes) section below.
 
+## Reporting Issues
+
+[InterSystems ObjectScript for VS Code](https://intersystems-community.github.io/vscode-objectscript/) consists of three collaborating VS Code extensions. This modular architecture also means there are three different GitHub repositories where issues can be created. Fortunately VS Code itself helps with the task. You will need a GitHub account. Here's how:
+
+1. From the Help menu in VS Code choose 'Report Issue'. Alternatively, open the Command Palette and run `Help: Report Issue...`.
+
+2. When the dialog appears, use the first dropdown to classify your issue:
+    - Bug Report
+    - Feature Request
+    - Performance Issue
+
+3. In the second dropdown pick 'An extension'
+
+4. The third dropdown lets you pick one of your installed extensions. You can type a few characters to find the right entry. For example, `isls` quickly selects "InterSystems Language Server".
+
+   Which one to choose? Here's a guide:
+   - InterSystems Language Server
+        - code coloring
+        - Intellisense
+   - InterSystems ObjectScript
+        - export, import and compile
+        - ObjectScript Explorer (browsing namespace contents)
+        - direct server-side editing using `isfs://` folders in a workspace
+        - integration with server-side source control etc
+   -  InterSystems Server Manager
+        - Server Browser on the InterSystems Tools view
+        - password management in local keychain
+        - definition and selection of entries in `intersystems.servers`
+
+    If unsure, pick InterSystems ObjectScript.
+
+5. Type a descriptive one-line summary of your issue. The dialog may offer a list of existing issues which could be duplicates. If you don't find one that covers yours, proceed.
+
+6. Enter details. If your VS Code is authenticated to GitHub the dialog's button is captioned "Create on GitHub" and clicking it will open the issue, then load it in your browser so you can edit it. Otherwise it reads "Preview on GitHub" and launches a browser page where you must complete and submit your report.
+
+   Tips for use on the GitHub page:
+
+    - Paste images from your clipboard directly into the report field. For hard-to-describe issues an animated GIF or a short MP4 gets bonus points. The `Developer: Toggle Screencast Mode` in VS Code can help your recording make more sense.
+    - Link to other issues by prefixing the target number with #
+    - Remember that whatever you post here is visible to anyone on the Internet. Mask/remove confidential information. Be polite.
+
 ## Notes
 
 - Connection-related output appears in the 'Output' view while switched to the 'ObjectScript' channel using the drop-down menu on the view titlebar.

docs/Configuration.md

@@ -11,7 +11,7 @@ VS Code settings enable you to customize various aspects of its function. The In
 {: #code-workspaces}
 ## VS Code Workspaces 
 
-To work with VS Code, you need to open a workspace. A VS Code workspace can be just the root folder of your project. Workspace settings and task configurations are stored in the root folder in the `settings.json` file in a folder called `.vscode`. Debugging launch configurations are stored in `launch.json`, also in `.vscode`.
+To work with VS Code, you need to open a workspace. In the simplest setup, a VS Code workspace is just the root folder of your project. Workspace settings and task configurations are stored in the root folder in the `settings.json` file in a folder called `.vscode`. Debugging launch configurations are stored in `launch.json`, also in `.vscode`.
 
 If you need to have more than one root folder in a VS Code workspace, use a feature called multi-root workspaces. See [Multi-root Workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces) in the VS Code documentation.
 
@@ -131,4 +131,4 @@ The components of this configuration are:
 
 - **ns** - namespace to use on the server
 - **server** - server name as specified in the server configuration
-- **active** - specifies whether the connection is active.
+- **active** - specifies whether the connection is active.

docs/ExtensionUI.md

@@ -36,7 +36,7 @@ This view shows server resources in a tree format.
 As you can see, the view groups servers into a variety of folders, such as currently in use, favorites, and recently used. Within the view, you can perform operations on the servers. When you move the cursor over a server listing, command buttons appear which let you mark the server as a favorite, or open the Management Portal for the server in either the simple browser in a VS Code tab or in an external browser:
 
 - ![Add to starred.](../assets/images/add-to-starred.png "add to starred")
-- ![Open Management Portal in tab.](../assets/images/management-portal-tab.png "open management portal the simple browser in VS Code")
+- ![Open Management Portal in tab.](../assets/images/management-portal-tab.png "open management portal in the simple browser in VS Code")
 - ![Open Management Portal in browser.](../assets/images/management-portal-browser.png "open management portal in browser")
 
 #### Notes About the VS Code Simple Browser
@@ -100,7 +100,7 @@ On Windows, the Server Manager can create connection entries for all connections
 
 ## ObjectScript View
 
-The InterSystems ObjectScript extension supplies an ObjectScript view container. The button to select it appears in the Activity Bar only when a folder or a workspace that includes a client-side folder is open:
+The InterSystems ObjectScript extension supplies an ObjectScript view container. The button to select this appears in the Activity Bar only when a folder or a workspace that includes a client-side folder is open:
 
 ![ObjectScript button.](../assets/images/objectscript.png "objectscript button")
 

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "1.0.11-SNAPSHOT",
+  "version": "1.0.12-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [
@@ -206,6 +206,18 @@
         {
           "command": "vscode-objectscript.jumpToTagAndOffset",
           "when": "editorLangId == objectscript"
+        },
+        {
+          "command": "vscode-objectscript.compileOnly",
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+        },
+        {
+          "command": "vscode-objectscript.compileOnlyWithFlags",
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
+        },
+        {
+          "command": "vscode-objectscript.editOthers",
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive"
         }
       ],
       "view/title": [
@@ -218,7 +230,7 @@
       "view/item/context": [
         {
           "command": "vscode-objectscript.explorer.export",
-          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:(?!(cspApplication|cspFileNode))/"
+          "when": "view == ObjectScriptExplorer && viewItem =~ /^dataNode:/"
         },
         {
           "command": "vscode-objectscript.explorer.export",
@@ -277,25 +289,35 @@
           "when": "vscode-objectscript.connectActive",
           "group": "objectscript@1"
         },
+        {
+          "command": "vscode-objectscript.editOthers",
+          "when": "resourceScheme == file && editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@2"
+        },
         {
           "command": "vscode-objectscript.compile",
           "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
-          "group": "objectscript@2"
+          "group": "objectscript@3"
         },
         {
           "command": "vscode-objectscript.previewXml",
           "when": "editorLangId =~ /^xml/",
-          "group": "objectscript@3"
+          "group": "objectscript@4"
         },
         {
           "command": "vscode-objectscript.serverCommands.contextSourceControl",
           "when": "resourceScheme == isfs && vscode-objectscript.connectActive",
-          "group": "objectscript@4"
+          "group": "objectscript@5"
         },
         {
           "command": "vscode-objectscript.serverCommands.contextOther",
           "when": "resourceScheme =~ /^isfs(-readonly)?$/ && vscode-objectscript.connectActive",
-          "group": "objectscript@5"
+          "group": "objectscript@6"
+        },
+        {
+          "command": "vscode-objectscript.compileOnly",
+          "when": "editorLangId =~ /^objectscript/ && vscode-objectscript.connectActive",
+          "group": "objectscript@7"
         }
       ],
       "editor/title": [
@@ -385,11 +407,12 @@
           "ObjectScript CSP"
         ],
         "extensions": [
-          "csp"
+          ".csp",
+          ".csr"
         ]
       },
       {
-        "id": "objectscript-output",
+        "id": "vscode-objectscript-output",
         "mimetypes": [
           "text/x-code-output"
         ]
@@ -614,6 +637,21 @@
         "category": "ObjectScript",
         "command": "vscode-objectscript.showExplorerForWorkspace",
         "title": "Show Explorer for Workspace"
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.compileOnly",
+        "title": "Compile Current File"
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.compileOnlyWithFlags",
+        "title": "Compile Current File with Specified Flags..."
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.editOthers",
+        "title": "Edit Other"
       }
     ],
     "keybindings": [
@@ -913,6 +951,16 @@
           "description": "Automatically show terminal when connected to docker-compose.",
           "type": "boolean",
           "default": false
+        },
+        "objectscript.compileOnSave": {
+          "description": "Automatically compile an InterSystems file when saved in the editor.",
+          "type": "boolean",
+          "default": true
+        },
+        "objectscript.multilineMethodArgs": {
+          "markdownDescription": "List method arguments on multiple lines, if the server supports it. **NOTE:** Only supported on IRIS 2019.1.2, 2020.1.1+, 2021.1.0+ and subsequent versions! On all other versions, this setting will have no effect.",
+          "type": "boolean",
+          "default": false
         }
       }
     },