Fix #453: JS should syntax highlight 'of' as a keyword

bobbylight · Sep 17, 2022 · a020749 · a020749
1 parent 3c04684
commit a020749
Show file tree

Hide file tree

Showing 9 changed files with 3,257 additions and 3,171 deletions.
diff --git a/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex b/RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex
@@ -966,71 +966,75 @@ URL						= (((https?|f(tp|ile))"://"|"www.")({URLCharacters}{URLEndCharacter})?)
 								  addToken(zzMarkedPos-1,zzMarkedPos-1, TokenTypes.MARKUP_TAG_DELIMITER);
 								}
 
-	// ECMA 3+ keywords.
+	// Keywords
+	"async" |
+	"await" |
 	"break" |
+	"case" |
+	"catch"	|
+	"class"	|
+	"const"	|
 	"continue" |
+	"debugger" |
 	"delete" |
+	"do" |
 	"else" |
+	"export" |
+	"extends" |
+	"finally" |
 	"for" |
 	"function" |
 	"if" |
+	"import" |
 	"in" |
+	"instanceof" |
 	"new" |
+	"null" |
+	"of" |
+	"static" |
+	"super" |
+	"switch" |
 	"this" |
+	"throw" |
+	"try" |
 	"typeof" |
 	"var" |
 	"void" |
 	"while" |
-	"with"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"return"					{ addToken(TokenTypes.RESERVED_WORD_2); }
+	"with" |
+    "yield"                     { addToken(Token.RESERVED_WORD); }
+	"return"					{ addToken(Token.RESERVED_WORD_2); }
 
 	//JavaScript 1.6
 	"each" 						{if(JavaScriptTokenMaker.isJavaScriptCompatible("1.6")){ addToken(TokenTypes.RESERVED_WORD);} else {addToken(TokenTypes.IDENTIFIER);} }
 	//JavaScript 1.7
 	"let" 						{if(JavaScriptTokenMaker.isJavaScriptCompatible("1.7")){ addToken(TokenTypes.RESERVED_WORD);} else {addToken(TokenTypes.IDENTIFIER);} }
 
 	// Reserved (but not yet used) ECMA keywords.
-	"abstract"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"boolean"						{ addToken(TokenTypes.DATA_TYPE); }
-	"byte"						{ addToken(TokenTypes.DATA_TYPE); }
-	"case"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"catch"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"char"						{ addToken(TokenTypes.DATA_TYPE); }
-	"class"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"const"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"debugger"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"default"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"do"							{ addToken(TokenTypes.RESERVED_WORD); }
-	"double"						{ addToken(TokenTypes.DATA_TYPE); }
-	"enum"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"export"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"extends"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"final"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"finally"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"float"						{ addToken(TokenTypes.DATA_TYPE); }
-	"goto"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"implements"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"import"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"instanceof"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"int"						{ addToken(TokenTypes.DATA_TYPE); }
-	"interface"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"long"						{ addToken(TokenTypes.DATA_TYPE); }
-	"native"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"package"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"private"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"protected"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"public"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"short"						{ addToken(TokenTypes.DATA_TYPE); }
-	"static"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"super"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"switch"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"synchronized"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"throw"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"throws"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"transient"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"try"						{ addToken(TokenTypes.RESERVED_WORD); }
-	"volatile"					{ addToken(TokenTypes.RESERVED_WORD); }
-	"null"						{ addToken(TokenTypes.RESERVED_WORD); }
+	"abstract"					{ addToken(Token.RESERVED_WORD); }
+	"boolean"						{ addToken(Token.DATA_TYPE); }
+	"byte"						{ addToken(Token.DATA_TYPE); }
+	"char"						{ addToken(Token.DATA_TYPE); }
+	"default"						{ addToken(Token.RESERVED_WORD); }
+	"double"						{ addToken(Token.DATA_TYPE); }
+	"enum"						{ addToken(Token.RESERVED_WORD); }
+	"final"						{ addToken(Token.RESERVED_WORD); }
+	"float"						{ addToken(Token.DATA_TYPE); }
+	"goto"						{ addToken(Token.RESERVED_WORD); }
+	"implements"					{ addToken(Token.RESERVED_WORD); }
+	"int"						{ addToken(Token.DATA_TYPE); }
+	"interface"					{ addToken(Token.RESERVED_WORD); }
+	"long"						{ addToken(Token.DATA_TYPE); }
+	"native"						{ addToken(Token.RESERVED_WORD); }
+	"package"						{ addToken(Token.RESERVED_WORD); }
+	"private"						{ addToken(Token.RESERVED_WORD); }
+	"protected"					{ addToken(Token.RESERVED_WORD); }
+	"public"						{ addToken(Token.RESERVED_WORD); }
+	"short"						{ addToken(Token.DATA_TYPE); }
+	"synchronized"					{ addToken(Token.RESERVED_WORD); }
+	"throws"						{ addToken(Token.RESERVED_WORD); }
+	"transient"					{ addToken(Token.RESERVED_WORD); }
+	"volatile"					{ addToken(Token.RESERVED_WORD); }
 
 	// Literals.
 	"false" |