syntaxes/classicalb.tmLanguage.json

@@ -137,7 +137,7 @@
 			"name": "string.quoted.backtickTriple.classicalb",
 			"patterns": [
 			  {
-				  "match": "\\$(\\[.*\\])?\\{.*\\}",
+				  "match": "\\$(\\[[^${}\\[\\]]*\\])?\\{[^${}\\[\\]]*\\}",
 				  "name": "constant.character.escape.template.classicalb"
 			  }
 			]
@@ -278,7 +278,7 @@
 	  "control_blocks": {
 		"patterns": [
 		  {
-			"begin": "(?x)\n\\b(BEGIN|PRE|SELECT|ANY|LET|VAR|ASSERT|WHILE|IF|CHOICE|CASE|EITHER)\\b",
+			"begin": "(?x)\n\\b(BEGIN|PRE|SELECT|WITNESS|ANY|LET|VAR|ASSERT|WHILE|IF|CHOICE|CASE|EITHER)\\b",
 			"beginCaptures": {
 			  "0": {
 				"name": "keyword.control.classicalb"

syntaxes/rmchAddOn.tmLanguage.json

@@ -143,7 +143,7 @@
 			"name": "string.quoted.backtickTriple.rmchAddOn",
 			"patterns": [
 			  {
-				  "match": "\\$(\\[.*\\])?\\{.*\\}",
+				  "match": "\\$(\\[[^${}\\[\\]]*\\])?\\{[^${}\\[\\]]*\\}",
 				  "name": "constant.character.escape.template.rmchAddOn"
 			  }
 		    ]
@@ -284,7 +284,7 @@
 	  "control_blocks": {
 		"patterns": [
 		  {
-			"begin": "(?x)\n\\b(BEGIN|PRE|SELECT|ANY|LET|VAR|ASSERT|WHILE|FOR|DO|IF|CHOICE|CASE|EITHER|IN)\\b",
+			"begin": "(?x)\n\\b(BEGIN|PRE|SELECT|WITNESS|ANY|LET|VAR|ASSERT|WHILE|FOR|DO|IF|CHOICE|CASE|EITHER|IN)\\b",
 			"beginCaptures": {
 			  "0": {
 				"name": "keyword.control.rmchAddOn"