VERSION 1.4.0

KaptainMicila · KaptainMicila · commit e7d3f45501ba · 2021-03-10T20:35:40.000+01:00
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "description": "GZDoom's ZScript scripting language support for VSCode",
     "publisher": "kaptainmicila",
     "icon": "icons/GZDoom.png",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/KaptainMicila/ZScript-VSCode.git"
diff --git a/syntaxes/acs.tmLanguage.json b/syntaxes/acs.tmLanguage.json
@@ -32,14 +32,14 @@
             "patterns": [
                 {
                     "name": "comment.line.double-slash.acs",
-                    "begin": "\\/\\/",
+                    "begin": "//",
                     "end": "$",
                     "contentName": "comment.line.double-slash.text.acs"
                 },
                 {
                     "name": "comment.block.acs",
-                    "begin": "\\/\\*",
-                    "end": "\\*\\/",
+                    "begin": "/\\*",
+                    "end": "\\*/",
                     "contentName": "comment.block.text.acs"
                 }
             ]
@@ -48,13 +48,13 @@
             "patterns": [
                 {
                     "name": "string.quoted.double.acs",
-                    "begin": "\"",
-                    "end": "\""
+                    "begin": "(?<!\\\\)\"",
+                    "end": "(?<!\\\\)\""
                 },
                 {
                     "name": "string.quoted.single.acs",
-                    "begin": "'",
-                    "end": "'"
+                    "begin": "(?<!\\\\)'",
+                    "end": "(?<!\\\\)'"
                 }
             ]
         },
@@ -90,15 +90,19 @@
                 },
                 {
                     "name": "keyword.operator.acs",
-                    "match": "(?:\\+\\+?|--?|\\*|\\/|%|<=?|>=?|&&|\\|\\|)"
+                    "match": "(?:[*\\/%|=^~]=?|[+\\-<>&!]{1,2}=?|:)"
                 }
             ]
         },
         "types": {
             "patterns": [
                 {
                     "name": "constant.numeric.acs",
-                    "match": "\\b\\d+?\\b"
+                    "match": "\\d+"
+                },
+                {
+                    "name": "constant.hexadecimal.acs",
+                    "match": "\\s0[xX][0-9a-fA-F]+"
                 },
                 {
                     "name": "constant.acs",
@@ -115,26 +119,34 @@
             ]
         },
         "functions": {
-            "name": "entity.name.function.acs",
-            "match": "\\w+?(?=\\s*?\\()"
+            "patterns": [
+                {
+                    "name": "entity.name.function.acs",
+                    "match": "\\w+(?=\\s*\\()"
+                },
+                {
+                    "name": "variable.parameter",
+                    "match": "\\w:"
+                }
+            ]
         },
         "directives": {
             "patterns": [
                 {
-                    "name": "keyword.control.include.acs",
-                    "match": "^\\#include\\b"
+                    "name": "keyword.control.directive.acs",
+                    "match": "^\\#(?:include|define|library)\\b"
                 }
             ]
         },
         "variable": {
             "patterns": [
                 {
-                    "name": "variable.parameter.zscript",
-                    "match": "(?<=\\w+?[\\[\\]]??\\.)\\w+?\\b"
+                    "name": "variable.parameter.acs",
+                    "match": "(?<=\\w+[\\[\\]]?\\.)\\w+\\b"
                 },
                 {
-                    "name": "variable.other.zscript",
-                    "match": "\\b\\w+?\\b"
+                    "name": "variable.other.acs",
+                    "match": "\\b\\w+\\b"
                 }
             ]
         }
diff --git a/syntaxes/zscript.tmLanguage.json b/syntaxes/zscript.tmLanguage.json
@@ -70,13 +70,13 @@
             "patterns": [
                 {
                     "name": "string.quoted.double.zscript",
-                    "begin": "\"",
-                    "end": "\""
+                    "begin": "(?<!\\\\)\"",
+                    "end": "(?<!\\\\)\""
                 },
                 {
                     "name": "string.quoted.single.zscript",
-                    "begin": "'",
-                    "end": "'"
+                    "begin": "(?<!\\\\)'",
+                    "end": "(?<!\\\\)'"
                 }
             ]
         },
@@ -110,6 +110,10 @@
                     "name": "constant.numeric.zscript",
                     "match": "\\b\\d+?\\b"
                 },
+                {
+                    "name": "constant.hexadecimal.zscript",
+                    "match": "\\s0[xX][0-9a-fA-F]+"
+                },
                 {
                     "name": "constant.zscript",
                     "match": "\\b[A-Z_0-9]+?\\b"

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@`
`32`	`32`	`"patterns": [`
`33`	`33`	`{`
`34`	`34`	`"name": "comment.line.double-slash.acs",`
`35`		`- "begin": "\\/\\/",`
	`35`	`+ "begin": "//",`
`36`	`36`	`"end": "$",`
`37`	`37`	`"contentName": "comment.line.double-slash.text.acs"`
`38`	`38`	`},`
`39`	`39`	`{`
`40`	`40`	`"name": "comment.block.acs",`
`41`		`- "begin": "\\/\\*",`
`42`		`- "end": "\\*\\/",`
	`41`	`+ "begin": "/\\*",`
	`42`	`+ "end": "\\*/",`
`43`	`43`	`"contentName": "comment.block.text.acs"`
`44`	`44`	`}`
`45`	`45`	`]`
`@@ -48,13 +48,13 @@`
`48`	`48`	`"patterns": [`
`49`	`49`	`{`
`50`	`50`	`"name": "string.quoted.double.acs",`
`51`		`- "begin": "\"",`
`52`		`- "end": "\""`
	`51`	`+ "begin": "(?<!\\\\)\"",`
	`52`	`+ "end": "(?<!\\\\)\""`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`"name": "string.quoted.single.acs",`
`56`		`- "begin": "'",`
`57`		`- "end": "'"`
	`56`	`+ "begin": "(?<!\\\\)'",`
	`57`	`+ "end": "(?<!\\\\)'"`
`58`	`58`	`}`
`59`	`59`	`]`
`60`	`60`	`},`
`@@ -90,15 +90,19 @@`
`90`	`90`	`},`
`91`	`91`	`{`
`92`	`92`	`"name": "keyword.operator.acs",`
`93`		`- "match": "(?:\\+\\+?\|--?\|\\*\|\\/\|%\|<=?\|>=?\|&&\|\\\|\\\|)"`
	`93`	`+ "match": "(?:[*\\/%\|=^~]=?\|[+\\-<>&!]{1,2}=?\|:)"`
`94`	`94`	`}`
`95`	`95`	`]`
`96`	`96`	`},`
`97`	`97`	`"types": {`
`98`	`98`	`"patterns": [`
`99`	`99`	`{`
`100`	`100`	`"name": "constant.numeric.acs",`
`101`		`- "match": "\\b\\d+?\\b"`
	`101`	`+ "match": "\\d+"`
	`102`	`+ },`
	`103`	`+ {`
	`104`	`+ "name": "constant.hexadecimal.acs",`
	`105`	`+ "match": "\\s0[xX][0-9a-fA-F]+"`
`102`	`106`	`},`
`103`	`107`	`{`
`104`	`108`	`"name": "constant.acs",`
`@@ -115,26 +119,34 @@`
`115`	`119`	`]`
`116`	`120`	`},`
`117`	`121`	`"functions": {`
`118`		`- "name": "entity.name.function.acs",`
`119`		`- "match": "\\w+?(?=\\s*?\\()"`
	`122`	`+ "patterns": [`
	`123`	`+ {`
	`124`	`+ "name": "entity.name.function.acs",`
	`125`	`+ "match": "\\w+(?=\\s*\\()"`
	`126`	`+ },`
	`127`	`+ {`
	`128`	`+ "name": "variable.parameter",`
	`129`	`+ "match": "\\w:"`
	`130`	`+ }`
	`131`	`+ ]`
`120`	`132`	`},`
`121`	`133`	`"directives": {`
`122`	`134`	`"patterns": [`
`123`	`135`	`{`
`124`		`- "name": "keyword.control.include.acs",`
`125`		`- "match": "^\\#include\\b"`
	`136`	`+ "name": "keyword.control.directive.acs",`
	`137`	`+ "match": "^\\#(?:include\|define\|library)\\b"`
`126`	`138`	`}`
`127`	`139`	`]`
`128`	`140`	`},`
`129`	`141`	`"variable": {`
`130`	`142`	`"patterns": [`
`131`	`143`	`{`
`132`		`- "name": "variable.parameter.zscript",`
`133`		`- "match": "(?<=\\w+?[\\[\\]]??\\.)\\w+?\\b"`
	`144`	`+ "name": "variable.parameter.acs",`
	`145`	`+ "match": "(?<=\\w+[\\[\\]]?\\.)\\w+\\b"`
`134`	`146`	`},`
`135`	`147`	`{`
`136`		`- "name": "variable.other.zscript",`
`137`		`- "match": "\\b\\w+?\\b"`
	`148`	`+ "name": "variable.other.acs",`
	`149`	`+ "match": "\\b\\w+\\b"`
`138`	`150`	`}`
`139`	`151`	`]`
`140`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@`
`70`	`70`	`"patterns": [`
`71`	`71`	`{`
`72`	`72`	`"name": "string.quoted.double.zscript",`
`73`		`- "begin": "\"",`
`74`		`- "end": "\""`
	`73`	`+ "begin": "(?<!\\\\)\"",`
	`74`	`+ "end": "(?<!\\\\)\""`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`"name": "string.quoted.single.zscript",`
`78`		`- "begin": "'",`
`79`		`- "end": "'"`
	`78`	`+ "begin": "(?<!\\\\)'",`
	`79`	`+ "end": "(?<!\\\\)'"`
`80`	`80`	`}`
`81`	`81`	`]`
`82`	`82`	`},`
`@@ -110,6 +110,10 @@`
`110`	`110`	`"name": "constant.numeric.zscript",`
`111`	`111`	`"match": "\\b\\d+?\\b"`
`112`	`112`	`},`
	`113`	`+ {`
	`114`	`+ "name": "constant.hexadecimal.zscript",`
	`115`	`+ "match": "\\s0[xX][0-9a-fA-F]+"`
	`116`	`+ },`
`113`	`117`	`{`
`114`	`118`	`"name": "constant.zscript",`
`115`	`119`	`"match": "\\b[A-Z_0-9]+?\\b"`