Xojo: REM is no longer highlighted as a keyword in comments (#2823)

XojoGermany · web-flow · commit ebbbfd471b16 · 2021-03-22T13:03:36.000+01:00
REM was incorrectly identified as a keyword. This has been fixed. REM is now recognized as a comment.
diff --git a/components/prism-xojo.js b/components/prism-xojo.js
@@ -1,9 +1,6 @@
 Prism.languages.xojo = {
 	'comment': {
-		pattern: /(?:'|\/\/|Rem\b).+/i,
-		inside: {
-			'keyword': /^Rem/i
-		}
+		pattern: /(?:'|\/\/|Rem\b).+/i
 	},
 	'string': {
 		pattern: /"(?:""|[^"])*"/,
@@ -14,7 +11,7 @@ Prism.languages.xojo = {
 		/&[bchou][a-z\d]+/i
 	],
 	'symbol': /#(?:If|Else|ElseIf|Endif|Pragma)\b/i,
-	'keyword': /\b(?:AddHandler|App|Array|As(?:signs)?|Auto|By(?:Ref|Val)|Boolean|Break|Byte|Call|Case|Catch|CFStringRef|CGFloat|Class|Color|Const|Continue|CString|Currency|CurrentMethodName|Declare|Delegate|Dim|Do(?:uble|wnTo)?|Each|Else(?:If)?|End|Enumeration|Event|Exception|Exit|Extends|False|Finally|For|Function|Get|GetTypeInfo|Global|GOTO|If|Implements|In|Inherits|Int(?:erface|eger|8|16|32|64)?|Lib|Loop|Me|Module|Next|Nil|Object|Optional|OSType|ParamArray|Private|Property|Protected|PString|Ptr|Raise(?:Event)?|ReDim|Rem|RemoveHandler|Return|Select(?:or)?|Self|Set|Single|Shared|Short|Soft|Static|Step|String|Sub|Super|Text|Then|To|True|Try|Ubound|UInt(?:eger|8|16|32|64)?|Until|Using|Var(?:iant)?|Wend|While|WindowPtr|WString)\b/i,
+	'keyword': /\b(?:AddHandler|App|Array|As(?:signs)?|Auto|By(?:Ref|Val)|Boolean|Break|Byte|Call|Case|Catch|CFStringRef|CGFloat|Class|Color|Const|Continue|CString|Currency|CurrentMethodName|Declare|Delegate|Dim|Do(?:uble|wnTo)?|Each|Else(?:If)?|End|Enumeration|Event|Exception|Exit|Extends|False|Finally|For|Function|Get|GetTypeInfo|Global|GOTO|If|Implements|In|Inherits|Int(?:erface|eger|8|16|32|64)?|Lib|Loop|Me|Module|Next|Nil|Object|Optional|OSType|ParamArray|Private|Property|Protected|PString|Ptr|Raise(?:Event)?|ReDim|RemoveHandler|Return|Select(?:or)?|Self|Set|Single|Shared|Short|Soft|Static|Step|String|Sub|Super|Text|Then|To|True|Try|Ubound|UInt(?:eger|8|16|32|64)?|Until|Using|Var(?:iant)?|Wend|While|WindowPtr|WString)\b/i,
 	'operator': /<[=>]?|>=?|[+\-*\/\\^=]|\b(?:AddressOf|And|Ctype|IsA?|Mod|New|Not|Or|Xor|WeakAddressOf)\b/i,
 	'punctuation': /[.,;:()]/
 };
diff --git a/components/prism-xojo.min.js b/components/prism-xojo.min.js
diff --git a/tests/languages/xojo/comment_feature.test b/tests/languages/xojo/comment_feature.test
@@ -5,9 +5,9 @@ Rem Foobar
 ----------------------------------------------------
 
 [
-	["comment", ["' Foobar"]],
-	["comment", ["// Foobar"]],
-	["comment", [["keyword", "Rem"], " Foobar"]]
+	["comment", "' Foobar"],
+	["comment", "// Foobar"],
+	["comment", "Rem Foobar"]
 ]
 
 ----------------------------------------------------
diff --git a/tests/languages/xojo/keyword_feature.test b/tests/languages/xojo/keyword_feature.test
@@ -71,7 +71,6 @@ Ptr
 Raise
 RaiseEvent
 ReDim
-Rem
 RemoveHandler
 Return
 Select
@@ -183,7 +182,6 @@ WString
 	["keyword", "Raise"],
 	["keyword", "RaiseEvent"],
 	["keyword", "ReDim"],
-	["keyword", "Rem"],
 	["keyword", "RemoveHandler"],
 	["keyword", "Return"],
 	["keyword", "Select"],

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ Rem Foobar`
`5`	`5`	`----------------------------------------------------`
`6`	`6`
`7`	`7`	`[`
`8`		`- ["comment", ["' Foobar"]],`
`9`		`- ["comment", ["// Foobar"]],`
`10`		`- ["comment", [["keyword", "Rem"], " Foobar"]]`
	`8`	`+ ["comment", "' Foobar"],`
	`9`	`+ ["comment", "// Foobar"],`
	`10`	`+ ["comment", "Rem Foobar"]`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`----------------------------------------------------`