Merge pull request intersystems-community#971 from gjsjohnmurray/pre-sync-1.8.2

Sync prerelease with 1.8.2

Author: gjsjohnmurray

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [1.9.2022080801] 08-Aug-2022 pre-release
+Add 1.8.2 changes.
+
 ## [1.9.2022072501] 25-Jul-2022 pre-release
 Add 1.8.1 changes.
 
@@ -29,6 +32,14 @@ Add 1.4.1 changes.
 
 ## [1.5.2022011401] 14-Jan-2022 pre-release
 Add 1.4.0 changes.
+
+## [1.8.2] 08-Aug-2022
+- Enhancements
+  - Support `objectscript` and `objectscript-class` as the info string for [fenced code blocks](https://spec.commonmark.org/0.30/#fenced-code-blocks) when editing Markdown. However coloring does not render in preview (#964)
+- Fixes
+  - Handle some previously uncaught errors (#966)
+  - Dispose of all event handlers when deactivating (#967)
+
 ## [1.8.1] 25-Jul-2022
 - Fixes
   - New class should ignore `objectscript.export.folder` setting (#938)

README.md

@@ -64,8 +64,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.8.1`, look for `1.8.2-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.8.2-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.8.2`, look for `1.8.3-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.8.3-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):

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "1.9.2022072502-SNAPSHOT",
+  "version": "1.9.2022080801-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [
@@ -601,6 +601,12 @@
       {
         "id": "vscode-objectscript-output",
         "aliases": []
+      },
+      {
+        "id": "objectscript-injection"
+      },
+      {
+        "id": "objectscript-class-injection"
       }
     ],
     "grammars": [
@@ -648,6 +654,28 @@
         "language": "vscode-objectscript-output",
         "scopeName": "source.vscode_objectscript_output",
         "path": "syntaxes/vscode-objectscript-output.tmLanguage.json"
+      },
+      {
+        "language": "objectscript-injection",
+        "scopeName": "markdown.objectscript.codeblock",
+        "path": "./syntaxes/objectscript_codeblock.json",
+        "injectTo": [
+          "text.html.markdown"
+        ],
+        "embeddedLanguages": {
+          "meta.embedded.block.objectscript": "objectscript"
+        }
+      },
+      {
+        "language": "objectscript-class-injection",
+        "scopeName": "markdown.objectscript_class.codeblock",
+        "path": "./syntaxes/objectscript-class_codeblock.json",
+        "injectTo": [
+          "text.html.markdown"
+        ],
+        "embeddedLanguages": {
+          "meta.embedded.block.objectscript_class": "objectscript-class"
+        }
       }
     ],
     "snippets": [
@@ -1414,6 +1442,7 @@
     "@types/xmldom": "^0.1.29",
     "@typescript-eslint/eslint-plugin": "^4.32.0",
     "@typescript-eslint/parser": "^4.32.0",
+    "@vscode/test-electron": "^2.1.5",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^6.11.0",
@@ -1429,7 +1458,6 @@
     "typescript": "^4.4.3",
     "vscode-debugadapter-testsupport": "^1.41.0",
     "vscode-dts": "^0.3.2",
-    "vscode-test": "^1.4.0",
     "webpack": "^5.27.1",
     "webpack-cli": "^4.5.0"
   },