Update grammars, themes and dependencies

.github/workflows/publication-workflow.yaml

@@ -7,23 +7,24 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
+          show-progress: false
 
       - uses: actions/setup-node@v3
         with:
           cache: npm
           cache-dependency-path: package-lock.json
-          node-version: '20.5.0'
+          node-version: '20.7.0'
 
       - name: install dependencies
         run: npm ci --no-audit --omit=dev --prefer-offline
 
       - name: compile
         run: node scripts/compile.js
 
-      - uses: actions/upload-pages-artifact@v1
+      - uses: actions/upload-pages-artifact@v2
         with:
           path: ./public
 

compose.yaml

@@ -1,6 +1,6 @@
 services:
     caddy:
-        image: caddy:2.6.4-alpine
+        image: caddy:2.7.4-alpine
         ports:
             - 80:80
             - 443:443
@@ -12,7 +12,7 @@ services:
 
     node:
         command: scripts/watch.js
-        image: node:20.5.0-alpine3.18
+        image: node:20.7.0-alpine3.18
         init: true
         user: ${HOST_UID:?}
         volumes:

package.json

@@ -8,7 +8,7 @@
     "jsdom": "^22.1.0",
     "mathjax-node": "^2.1.1",
     "onigasm": "^2.2.5",
-    "postcss": "^8.4.27",
+    "postcss": "^8.4.30",
     "vscode-textmate": "^9.0.0",
     "yargs": "^17.7.2"
   },

scripts/grammar/source.shell.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/ce62ea59e8e522f8a07d8d8a2d1f992c6c600b91",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/a3de7b32f1537194a83ee848838402fbf4b67424",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
@@ -268,7 +268,7 @@
 			"patterns": [
 				{
 					"begin": "(?=\\S)",
-					"end": ";;",
+					"end": ";;&?|;&",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.terminator.case-clause.shell"
@@ -311,7 +311,7 @@
 						},
 						{
 							"begin": "(?<=\\))",
-							"end": "(?=;;)",
+							"end": "(?=;;&?|;&)",
 							"name": "meta.scope.case-clause-body.shell",
 							"patterns": [
 								{

scripts/theme/dark_plus.json

@@ -77,6 +77,7 @@
 				"source.cpp keyword.operator.new",
 				"keyword.operator.delete",
 				"keyword.other.using",
+				"keyword.other.directive.using",
 				"keyword.other.operator",
 				"entity.name.operator"
 			],

scripts/theme/dark_vs.json

@@ -26,13 +26,15 @@
 		"list.activeSelectionIconForeground": "#FFF",
 		"terminal.inactiveSelectionBackground": "#3A3D41",
 		"widget.border": "#303031",
+		"actionBar.toggledBackground": "#383a49"
 	},
 	"tokenColors": [
 		{
 			"scope": [
 				"meta.embedded",
 				"source.groovy.embedded",
 				"string meta.image.inline.markdown",
+				"variable.legacy.builtin.python"
 			],
 			"settings": {
 				"foreground": "#D4D4D4"

scripts/theme/light_plus.json

@@ -77,6 +77,7 @@
 				"source.cpp keyword.operator.new",
 				"source.cpp keyword.operator.delete",
 				"keyword.other.using",
+				"keyword.other.directive.using",
 				"keyword.other.operator",
 				"entity.name.operator"
 			],

scripts/theme/light_vs.json

@@ -30,14 +30,16 @@
 		"list.activeSelectionIconForeground": "#FFF",
 		"list.focusAndSelectionOutline": "#90C2F9",
 		"terminal.inactiveSelectionBackground": "#E5EBF1",
-		"widget.border": "#d4d4d4"
+		"widget.border": "#d4d4d4",
+		"actionBar.toggledBackground": "#dddddd"
 	},
 	"tokenColors": [
 		{
 			"scope": [
 				"meta.embedded",
 				"source.groovy.embedded",
-				"string meta.image.inline.markdown"
+				"string meta.image.inline.markdown",
+				"variable.legacy.builtin.python"
 			],
 			"settings": {
 				"foreground": "#000000ff"

source/assets/code.css

@@ -368,6 +368,9 @@
 [class*=" keyword.control.anchor.regexp"] {
     color: #EE0000;
 }
+[class*=" keyword.other.directive.using"] {
+    color: #AF00DB;
+}
 [class*=" meta.definition.variable.name"] {
     color: #001080;
 }
@@ -398,6 +401,9 @@
 [class*=" string.unquoted.plain.out.yaml"] {
     color: #0000ff;
 }
+[class*=" variable.legacy.builtin.python"] {
+    color: #000000ff;
+}
 [class*=" keyword.operator.logical.python"] {
     color: #0000ff;
 }
@@ -882,6 +888,9 @@
 }
     [class*=" keyword.control.anchor.regexp"] {
         color: #DCDCAA;
+}
+    [class*=" keyword.other.directive.using"] {
+        color: #C586C0;
 }
     [class*=" meta.definition.variable.name"] {
         color: #9CDCFE;
@@ -906,6 +915,9 @@
 }
     [class*=" storage.type.parameters.groovy"] {
         color: #4EC9B0;
+}
+    [class*=" variable.legacy.builtin.python"] {
+        color: #D4D4D4;
 }
     [class*=" keyword.operator.logical.python"] {
         color: #569cd6;