Merge pull request #31 from ArielG-NV/support-hlsl-raypayload-and-access-qualifiers

Add grammer for raypayload decoration and raypayload variable qualifiers

Author: ArielG-NV

syntaxes/slang.tmLanguage.json

@@ -38,18 +38,6 @@
 		"match": "\\b(const|extern|register|restrict|static|volatile|inline|nointerpolation|precise|row_major|column_major|snorm|unorm|globallycoherent|layout)\\b",
 		"name": "storage.modifier.slang"
 	  },
-	  {
-		"match": "\\bk[A-Z]\\w*\\b",
-		"name": "constant.other.variable.mac-classic.slang"
-	  },
-	  {
-		"match": "\\bg[A-Z]\\w*\\b",
-		"name": "variable.other.readwrite.global.mac-classic.slang"
-	  },
-	  {
-		"match": "\\bs[A-Z]\\w*\\b",
-		"name": "variable.other.readwrite.static.mac-classic.slang"
-	  },
 	  {
 		"match": "\\b(nullptr|none|true|false)\\b",
 		"name": "constant.language.slang"
@@ -472,6 +460,33 @@
 			"patterns": [
 			  {
 				"include": "#block_innards"
+			  },
+			  {
+				"name": "meta.variable.qualifer",
+				"begin":"(?x) (\\b([a-zA-Z_][a-zA-Z_0-9]*)\\b)\\s*(?=:\\s*((read|write).*))",
+				"beginCaptures": {
+					"1": {
+						"name": "variable.other.slang"
+					},
+					"3": {
+						"patterns": [
+							{
+								"include": "#access_qualifier"
+							}
+						]
+					}
+				},
+				"end": ";",
+				"endCaptures": {
+					"0": {
+						"name": "punctuation.semicolon.slang"
+					}
+				},
+				"patterns": [
+					{
+						"include": "#access_qualifier"
+					}
+				]
 			  }
 			]
 		  }
@@ -2895,12 +2910,19 @@
 			"name": "storage.type.built-in.primitive.slang"
 		  },
 		  {
-			  "match": "\\b(namespace|enum|enum\\s+class|struct|class|interface)\\s+([A-Za-z0-9_]+)((\\.|::)([A-Za-z0-9_]+))*",
+			  "match": "\\b(namespace|enum|enum\\s+class|struct|class|interface)\\s+(\\[.*\\])?\\s*([A-Za-z0-9_]+)((\\.|::)([A-Za-z0-9_]+))*",
 			  "captures":{
 				"1": {"name": "keyword.$1.slang" },
-				"2": {"name": "support.type.$1.slang" },
-				"4": {"name": "punctuation.separator.dot-access.slang"},
-				"5": {"name": "support.type.$1.slang" }
+				"3": {
+					"patterns": [
+						{
+							"include": "meta.bracket.square.access.slang"
+						}
+					]
+				},
+				"4": {"name": "support.type.$1.slang" },
+				"6": {"name": "punctuation.separator.dot-access.slang"},
+				"7": {"name": "support.type.$1.slang" }
 			  }
 		  },
 		  {
@@ -3351,8 +3373,38 @@
 		]
 	  },
 	  "vararg_ellipses": {
-		"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
-		"name": "punctuation.vararg-ellipses.slang"
+			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
+			"name": "punctuation.vararg-ellipses.slang"
+	  },
+      "shader_stages": {
+		"match": "\\b(vertex|fragment|compute|hull|domain|geometry|raygen|intersection|anyhit|closesthit|miss|mesh|amplification|callable)\\b",
+		"name": "variable.other.constant.shader_stage"
+	  },
+	  "access_qualifier": {
+		"name": "meta.variable.qualifer.access_qualifier",
+		"match": "(?x)(:)\\s*\\b(read|write)\\b \\((([A-z]+)(,\\s*([A-z]+)\\s*)*)?(\\))",
+		"captures": {
+			"1": {
+				"name": "punctuation.separator.delimiter.colon.slang"
+			},
+			"2": {
+				"name": "keyword.other.additional.slang"
+			},
+			"3": {
+				"patterns": [
+					{
+						"include":"#shader_stages"
+					}
+				]
+			},
+			"5": {
+				"patterns": [
+					{
+						"include":"#shader_stages"
+					}
+				]
+			}
+		}
 	  }
 	},
 	"name": "Slang"