Merge remote-tracking branch 'upstream/master' into pre-sync-1.6.0

Author: gjsjohnmurray

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [1.7.2022040601] 06-Apr-2022 pre-release
+Add 1.6.0 changes.
+
 ## [1.5.2022032101] 21-Mar-2022 pre-release
 Add 1.4.4 changes.
 
@@ -20,6 +23,20 @@ Add 1.4.1 changes.
 
 ## [1.5.2022011401] 14-Jan-2022 pre-release
 Add 1.4.0 changes.
+## [1.6.0] 06-Apr-2022
+Minimum VS Code version is now 1.66.0
+- Enhancements
+  - Colorize text in Output channel (API has finalized) (#910)
+  - Add `objectscript.export.exactFilter` setting (#913)
+  - Improve error message when debugging fails to start (#908)
+- Fixes
+  - Align `objectscript.openClassContracted` setting with Studio's behavior (#876)
+  - Properly handle errors when previewing XML as UDL (#906)
+  - Fix importing of web app files (#777)
+  - Correctly use `http.proxyStrictSSL` setting (#919)
+  - Fix problems caused by extension running on server and VS Code UI in web browser (#911)
+  - Upgrade vulnerable dependencies.
+
 ## [1.4.4] 21-Mar-2022
 - Enhancements
   - Compile asynchronously to avoid timing out (#890)

README.md

@@ -62,8 +62,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.4.4`, look for `1.4.5-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.4.5-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.6.0`, look for `1.6.1-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.6.1-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 (required for both Stable and Insiders versions of VS Code):

docs/RunDebug.md

@@ -110,4 +110,6 @@ Clicking on the green arrow runs the currently selected debug configuration.
 
 When starting **objectscript launch** debug session, make sure that the file containing the **program** that you are debugging is open in your editor and is the active tab. VS Code will start a debug session with the server of the file in the active editor (the tab that the user is focused on).
 
-Debugging commands and items on the **Run** menu function much as they do for other languages supported by VS Code. For information on VS Code debugging, see the documentation resources listed at the start of this section. 
+This extension uses WebSockets to communicate with the InterSystems server during debugging. If you are experiencing issues when trying to start a debugging session, check that the InterSystems server's web server allows WebSocket connections.
+
+Debugging commands and items on the **Run** menu function much as they do for other languages supported by VS Code. For information on VS Code debugging, see the documentation resources listed at the start of this section. 

docs/SettingsReference.md

@@ -46,6 +46,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
 | `"objectscript.export.atelier"` | Export source code as Atelier did it, with packages as subfolders. | `boolean` | `true` | |
 | `"objectscript.export.category"` | Category of source code to export: `CLS` = classes; `RTN` = routines; `CSP` = csp files; `OTH` = other. Default is `*` = all. | `string` or `object` | `"*"` | |
 | `"objectscript.export.dontExportIfNoChanges"` | Do not rewrite the local file if the content is identical to what came from the server. | `boolean` | `false` | |
+| `"objectscript.export.exactFilter"` | SQL filter to limit what to export. | `string` | `""` | The filter is applied to document names using the [LIKE predicate](https://irisdocs.intersystems.com/irislatest/csp/docbook/DocBook.UI.Page.cls?KEY=RSQL_like) (i.e. `Name LIKE 'exactFilter'`). If provided, `objectscript.export.filter` is ignored. |
 | `"objectscript.export.filter"` | SQL filter to limit what to export. | `string` | `""` | The filter is applied to document names using the [LIKE predicate](https://irisdocs.intersystems.com/irislatest/csp/docbook/DocBook.UI.Page.cls?KEY=RSQL_like) (i.e. `Name LIKE '%filter%'`). |
 | `"objectscript.export.folder"` | Folder for exported source code within workspace. | `string` | `"src"` | |
 | `"objectscript.export.generated"` | Export generated source code files, such as INTs generated from classes. | `boolean` | `false` | |
@@ -56,7 +57,7 @@ The extensions in the InterSystems ObjectScript Extension Pack provide many sett
 | `"objectscript.format.functionCase"` | Case for system functions and system variables. | `"upper"`, `"lower"` or `"word"` | `"word"` | Has no effect if the `InterSystems Language Server` extension is installed and enabled. |
 | `"objectscript.ignoreInstallServerManager"` | Do not offer to install the [intersystems-community.servermanager](https://marketplace.visualstudio.com/items?itemName=intersystems-community.servermanager) extension. | `boolean` | `false` | |
 | `"objectscript.multilineMethodArgs"` | List method arguments on multiple lines, if the server supports it. | `boolean` | `false` | 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. |
-| `"objectscript.openClassContracted"` | Automatically collapse all folding ranges when a class is opened for the first time. | `boolean` | `false` | |
+| `"objectscript.openClassContracted"` | Automatically collapse all class member folding ranges when a class is opened for the first time. | `boolean` | `false` | |
 | `"objectscript.overwriteServerChanges"` | Overwrite a changed server version without confirmation when importing the local file. | `boolean` | `false` | |
 | `"objectscript.serverSideEditing"` | Allow editing code directly on the server after opening it from ObjectScript Explorer. | `boolean` | `false` | |
 | `"objectscript.serverSourceControl.disableOtherActionTriggers"` | Prevent server-side source control 'other action' triggers from firing. | `boolean` | `false` | |

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "1.5.2022032101-SNAPSHOT",
+  "version": "1.7.2022040601-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [
@@ -47,12 +47,11 @@
     }
   ],
   "engines": {
-    "vscode": "^1.63.0"
+    "vscode": "^1.66.0"
   },
   "enabledApiProposals": [
     "fileSearchProvider",
-    "textSearchProvider",
-    "outputChannelLanguage"
+    "textSearchProvider"
   ],
   "activationEvents": [
     "onDebug",
@@ -92,8 +91,7 @@
     "viewsWelcome": [
       {
         "view": "explorer",
-        "contents": "Begin local ObjectScript development by opening a folder or cloning a repository. Then switch to the new ObjectScript view in the Activity Bar.\nYou can also create a new workspace to [edit or view code directly on an InterSystems server](https://intersystems-community.github.io/vscode-objectscript/serverside/).\n[Choose Server and Namespace](command:vscode-objectscript.addServerNamespaceToWorkspace)",
-        "when": "!isWeb"
+        "contents": "Begin local ObjectScript development by opening a folder or cloning a repository. Then switch to the new ObjectScript view in the Activity Bar.\nYou can also create a new workspace to [edit or view code directly on an InterSystems server](https://intersystems-community.github.io/vscode-objectscript/serverside/).\n[Choose Server and Namespace](command:vscode-objectscript.addServerNamespaceToWorkspace)"
       },
       {
         "view": "ObjectScriptExplorer",
@@ -550,8 +548,7 @@
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.export",
-        "title": "Export Code from Server",
-        "enablement": "!isWeb"
+        "title": "Export Code from Server"
       },
       {
         "category": "ObjectScript",
@@ -669,8 +666,7 @@
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.serverActions",
-        "title": "Server Actions...",
-        "enablement": "!isWeb"
+        "title": "Server Actions..."
       },
       {
         "category": "ObjectScript",
@@ -707,20 +703,17 @@
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.addServerNamespaceToWorkspace",
-        "title": "Add Server Namespace to Workspace...",
-        "enablement": "!isWeb"
+        "title": "Add Server Namespace to Workspace..."
       },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.connectFolderToServerNamespace",
-        "title": "Connect Folder to Server Namespace...",
-        "enablement": "!isWeb"
+        "title": "Connect Folder to Server Namespace..."
       },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.hideExplorerForWorkspace",
-        "title": "Hide Explorer for Workspace",
-        "enablement": "!isWeb"
+        "title": "Hide Explorer for Workspace"
       },
       {
         "category": "ObjectScript",
@@ -746,34 +739,32 @@
         "category": "ObjectScript",
         "command": "vscode-objectscript.showClassDocumentationPreview",
         "title": "Show Class Documentation Preview",
-        "enablement": "!isWeb",
         "icon": "$(open-preview)"
       },
       {
         "category": "ObjectScript",
         "command": "vscode-objectscript.exportCurrentFile",
-        "title": "Export Current File from Server",
-        "enablement": "!isWeb"
+        "title": "Export Current File from Server"
       }
     ],
     "keybindings": [
       {
         "command": "vscode-objectscript.compile",
         "key": "Ctrl+F7",
         "mac": "Cmd+F7",
-        "when": "!isWeb && editorLangId =~ /^objectscript/"
+        "when": "editorLangId =~ /^objectscript/"
       },
       {
         "command": "vscode-objectscript.compileAll",
         "key": "Ctrl+Shift+F7",
         "mac": "Cmd+Shift+F7",
-        "when": "!isWeb && editorLangId =~ /^objectscript/"
+        "when": "editorLangId =~ /^objectscript/"
       },
       {
         "command": "vscode-objectscript.viewOthers",
         "key": "Ctrl+Shift+V",
         "mac": "Cmd+Shift+V",
-        "when": "!isWeb && editorLangId =~ /^objectscript/"
+        "when": "editorLangId =~ /^objectscript/"
       }
     ],
     "configuration": {
@@ -898,6 +889,7 @@
             "atelier": true,
             "generated": false,
             "filter": "",
+            "exactFilter": "",
             "category": "*",
             "noStorage": false,
             "dontExportIfNoChanges": false,
@@ -957,6 +949,10 @@
               "markdownDescription": "SQL filter to limit what to export. The filter is applied to document names using the [LIKE predicate](https://irisdocs.intersystems.com/irislatest/csp/docbook/DocBook.UI.Page.cls?KEY=RSQL_like) (i.e. `Name LIKE '%filter%'`).",
               "type": "string"
             },
+            "exactFilter": {
+              "markdownDescription": "SQL filter to limit what to export. The filter is applied to document names using the [LIKE predicate](https://irisdocs.intersystems.com/irislatest/csp/docbook/DocBook.UI.Page.cls?KEY=RSQL_like) (i.e. `Name LIKE 'exactFilter'`). If provided, `objectscript.export.filter` is ignored.",
+              "type": "string"
+            },
             "category": {
               "markdownDescription": "Category of source code to export: `CLS` = classes; `RTN` = routines; `CSP` = csp files; `OTH` = other. Default is `*` = all.",
               "type": [
@@ -1068,7 +1064,7 @@
           "default": false
         },
         "objectscript.openClassContracted": {
-          "description": "Automatically collapse all folding ranges when a class is opened for the first time.",
+          "description": "Automatically collapse all class member folding ranges when a class is opened for the first time.",
           "type": "boolean",
           "default": false
         },
@@ -1084,7 +1080,7 @@
         {
           "id": "ObjectScriptExplorer",
           "name": "Explorer",
-          "when": "!isWeb && workspaceFolderCount != 0 && config.objectscript.showExplorer == true"
+          "when": "workspaceFolderCount != 0 && config.objectscript.showExplorer == true"
         }
       ]
     },
@@ -1114,7 +1110,6 @@
         "label": "ObjectScript Debug",
         "program": "./out/debug/debugAdapter.js",
         "runtime": "node",
-        "when": "!isWeb",
         "configurationAttributes": {
           "launch": {
             "required": [],
@@ -1207,14 +1202,14 @@
     "test": "node ./out/test/runTest.js",
     "lint": "eslint src/**",
     "lint-fix": "eslint --fix src/**",
-    "download-api": "vscode-dts dev 1.65.0",
+    "download-api": "vscode-dts dev 1.66.0",
     "postinstall": "npm run download-api"
   },
   "devDependencies": {
     "@types/glob": "^7.1.2",
     "@types/mocha": "^7.0.2",
     "@types/node": "^14.18.0",
-    "@types/vscode": "^1.43.0",
+    "@types/vscode": "^1.66.0",
     "@types/ws": "^7.2.5",
     "@types/xmldom": "^0.1.29",
     "@typescript-eslint/eslint-plugin": "^4.32.0",

package.json

@@ -286,7 +286,7 @@ export class AtelierAPI {
     const agent = new http.Agent({
       keepAlive: true,
       maxSockets: 10,
-      rejectUnauthorized: https && config("http.proxyStrictSSL"),
+      rejectUnauthorized: https && vscode.workspace.getConfiguration("http").get("proxyStrictSSL"),
     });
 
     let pathPrefix = this._config.pathPrefix || "";

src/api/index.ts

@@ -14,13 +14,12 @@ import {
 } from "../extension";
 import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 import {
+  cspAppsForUri,
   currentFile,
   CurrentFile,
   currentFileFromContent,
-  currentWorkspaceFolder,
   outputChannel,
   throttleRequests,
-  uriOfWorkspaceFolder,
 } from "../utils";
 import { PackageNode } from "../explorer/models/packageNode";
 import { NodeBase } from "../explorer/models/nodeBase";
@@ -423,10 +422,7 @@ export async function importFolder(uri: vscode.Uri, noCompile = false): Promise<
     return importFiles([uripath], noCompile);
   }
   let globpattern = "*.{cls,inc,int,mac}";
-  const workspace = currentWorkspaceFolder();
-  const workspacePath = uriOfWorkspaceFolder(workspace).fsPath;
-  const folderPathNoWorkspaceArr = uripath.replace(workspacePath + path.sep, "").split(path.sep);
-  if (folderPathNoWorkspaceArr.includes("csp")) {
+  if (cspAppsForUri(uri).findIndex((cspApp) => uri.path.includes(cspApp + "/") || uri.path.endsWith(cspApp)) != -1) {
     // This folder is a CSP application, so import all files
     // We need to include eveything becuase CSP applications can
     // include non-InterSystems files

src/commands/compile.ts

@@ -246,7 +246,7 @@ export async function exportAll(): Promise<any> {
   }
   const api = new AtelierAPI(workspaceFolder);
   outputChannel.show(true);
-  const { category, generated, filter } = config("export", workspaceFolder);
+  const { category, generated, filter, exactFilter } = config("export", workspaceFolder);
   // Replicate the behavior of getDocNames() but use StudioOpenDialog for better performance
   let filterStr = "";
   switch (category) {
@@ -263,11 +263,18 @@ export async function exportAll(): Promise<any> {
       filterStr = "Type %INLIST $LISTFROMSTRING('0,1,2,3,11,12')";
       break;
   }
-  if (filter !== "") {
-    if (filterStr !== "") {
-      filterStr += " AND ";
+  if (filter !== "" || exactFilter !== "") {
+    if (exactFilter !== "") {
+      if (filterStr !== "") {
+        filterStr += " AND ";
+      }
+      filterStr += `Name LIKE '${exactFilter}'`;
+    } else {
+      if (filterStr !== "") {
+        filterStr += " AND ";
+      }
+      filterStr += `Name LIKE '%${filter}%'`;
     }
-    filterStr += `Name LIKE '%${filter}%'`;
   }
   return api
     .actionQuery("SELECT Name FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?,?)", [