Including some valid chars into words.

Included HAS detection in the function-definition
Oldes · May 19, 2014 · cb45688 · cb45688
1 parent 0dae8b6
commit cb45688
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Rebol.JSON-tmLanguage b/Rebol.JSON-tmLanguage
@@ -380,17 +380,17 @@
 
 		"word-getword": {
 			"name": "support.variable.getword.rebol",
-			"match": "(?<=^|\\s|\\[|\\]|\\)|\\():[A-Za-z_0-9\\*\\?=_-]+(?=\\s|\\)|\\])"
+			"match": "(?<=^|\\s|\\[|\\]|\\)|\\():[A-Za-z_0-9=_\\-\\!\\?\\*\\+\\.~:']+(?=\\s|\\)|\\])"
 		},
 
 		"word-litword": {
 			"name": "keyword.litword.rebol",
-			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()'[A-Za-z_0-9\\*\\?=_-]+(?=\\s|\\)|\\])"
+			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()'[A-Za-z_0-9=_\\-\\!\\?\\*\\+\\.~:']+(?=\\s|\\)|\\])"
 		},
 
 		"word-datatype": {
 			"name": "support.type.rebol",
-			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()([A-Za-z_0-9\\-_\\*\\?]+\\!|as)(?=\\s|\\)|\\])"
+			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()([A-Za-z_0-9=_\\-\\?\\*\\+\\.~:']+\\!|as)(?=\\s|\\)|\\])"
 		},
 
 		"word-group1": {
@@ -421,7 +421,7 @@
 		//WORD is defined here so numbers are not detected inside words like:  foo-2-boo
 		"word": {
 			"name": "word.rebol",
-			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()[A-Za-z_\\*\\?=_-]+[A-Za-z_0-9\\*\\?=_-]*(?=\\s|\\)|\\]|/|;|\\\"|{)"
+			"match": "(?<=^|\\s|\\[|\\]|\\)|\\()[A-Za-z_\\*\\?=_-]+[A-Za-z_0-9=_\\-\\!\\?\\*\\+\\.~:']*(?=\\s|\\)|\\]|/|;|\\\"|{)"
 		},
 
 		"function-definition-block": {
@@ -436,7 +436,7 @@
 
 		"function-definition": {
 			"name": "function.definition",
-			"begin": "([A-Za-z=\\!\\?\\*_\\+][A-Za-z0-9=_\\-\\!\\?\\*\\+\\.]*):\\s+(?i)(function|func|funct|routine)\\s*(\\[)",
+			"begin": "([A-Za-z=\\!\\?\\*_\\+][A-Za-z0-9=_\\-\\!\\?\\*\\+\\.]*):\\s+(?i)(function|func|funct|routine|has)\\s*(\\[)",
 			"beginCaptures": {
 				"1": {"name": "support.variable.function.rebol"},
 				"2": {"name": "keyword.function"},

diff --git a/Rebol.tmLanguage b/Rebol.tmLanguage
@@ -359,7 +359,7 @@
 		<key>function-definition</key>
 		<dict>
 			<key>begin</key>
-			<string>([A-Za-z=\!\?\*_\+][A-Za-z0-9=_\-\!\?\*\+\.]*):\s+(?i)(function|func|funct|routine)\s*(\[)</string>
+			<string>([A-Za-z=\!\?\*_\+][A-Za-z0-9=_\-\!\?\*\+\.]*):\s+(?i)(function|func|funct|routine|has)\s*(\[)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -843,21 +843,21 @@
 		<key>word</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;=^|\s|\[|\]|\)|\()[A-Za-z_\*\?=_-]+[A-Za-z_0-9\*\?=_-]*(?=\s|\)|\]|/|;|\"|{)</string>
+			<string>(?&lt;=^|\s|\[|\]|\)|\()[A-Za-z_\*\?=_-]+[A-Za-z_0-9=_\-\!\?\*\+\.~:']*(?=\s|\)|\]|/|;|\"|{)</string>
 			<key>name</key>
 			<string>word.rebol</string>
 		</dict>
 		<key>word-datatype</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;=^|\s|\[|\]|\)|\()([A-Za-z_0-9\-_\*\?]+\!|as)(?=\s|\)|\])</string>
+			<string>(?&lt;=^|\s|\[|\]|\)|\()([A-Za-z_0-9=_\-\?\*\+\.~:']+\!|as)(?=\s|\)|\])</string>
 			<key>name</key>
 			<string>support.type.rebol</string>
 		</dict>
 		<key>word-getword</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;=^|\s|\[|\]|\)|\():[A-Za-z_0-9\*\?=_-]+(?=\s|\)|\])</string>
+			<string>(?&lt;=^|\s|\[|\]|\)|\():[A-Za-z_0-9=_\-\!\?\*\+\.~:']+(?=\s|\)|\])</string>
 			<key>name</key>
 			<string>support.variable.getword.rebol</string>
 		</dict>
@@ -899,7 +899,7 @@
 		<key>word-litword</key>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;=^|\s|\[|\]|\)|\()'[A-Za-z_0-9\*\?=_-]+(?=\s|\)|\])</string>
+			<string>(?&lt;=^|\s|\[|\]|\)|\()'[A-Za-z_0-9=_\-\!\?\*\+\.~:']+(?=\s|\)|\])</string>
 			<key>name</key>
 			<string>keyword.litword.rebol</string>
 		</dict>