diff --git a/CHANGELOG.md b/CHANGELOG.md index a9254fc68..a0b1c2ae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. - [#2436] PDF export clipping - missing colors / text - [#2437] AS1 P-code - do not group pushes automatically - [#2437] AS1 - use Constant pool only on FP5+ +- [#2430] AS1/2/3 - Missing syntax hilighting of "new" keyword and few others ## [22.0.2] - 2025-01-17 ### Added @@ -3702,6 +3703,7 @@ Major version of SWF to XML export changed to 2. [#2391]: https://www.free-decompiler.com/flash/issues/2391 [#2436]: https://www.free-decompiler.com/flash/issues/2436 [#2437]: https://www.free-decompiler.com/flash/issues/2437 +[#2430]: https://www.free-decompiler.com/flash/issues/2430 [#2375]: https://www.free-decompiler.com/flash/issues/2375 [#2374]: https://www.free-decompiler.com/flash/issues/2374 [#2389]: https://www.free-decompiler.com/flash/issues/2389 diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar index 185da06cb..c6b05d769 100644 Binary files a/lib/jsyntaxpane-0.9.5.jar and b/lib/jsyntaxpane-0.9.5.jar differ diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex index 1f2349f05..62147b182 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex @@ -182,7 +182,12 @@ RegExp = \/([^\r\n/]|\\\/)+\/[a-z]* "false" | "null" | "this" | - "true" { return token(TokenType.KEYWORD); } + "true" | + "delete" | + "instanceof" | + "new" | + "typeof" | + "void" { return token(TokenType.KEYWORD); } {RegExp} { @@ -244,12 +249,7 @@ RegExp = \/([^\r\n/]|\\\/)+\/[a-z]* "%=" | "<<=" | ">>=" | - ">>>=" | - "delete" | - "instanceof" | - "new" | - "typeof" | - "void" | + ">>>=" | {NewVector} | "@" { return token(TokenType.OPERATOR); } diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript3.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript3.flex index c82530eda..4e02158d9 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript3.flex +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript3.flex @@ -205,7 +205,14 @@ VerbatimString = "@\"" {VerbatimStringCharacter}* "\"" "false" | "null" | "this" | - "true" { return token(TokenType.KEYWORD); } + "true" | + "as" | + "delete" | + "instanceof" | + "is" | + "new" | + "typeof" | + "void" { return token(TokenType.KEYWORD); } {RegExp} { @@ -279,15 +286,8 @@ VerbatimString = "@\"" {VerbatimStringCharacter}* "\"" "<<=" | ">>=" | ">>>=" | - "as" | - "delete" | - "instanceof" | - "is" | "::" | - "new" | - "typeof" | - "void" | - {NewVector} | + {NewVector} | "@" { return token(TokenType.OPERATOR); } /* string literal */