New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ActionScript] refactor syntax #3558

Draft

jrappen wants to merge 29 commits into sublimehq:master from jrappen:fix-actionscript

Contributor

jrappen commented Nov 13, 2022 •

edited

update to syntax v2
add variables
move comments to prototype context
add named contexts for strings & comments while making use of meta_scope
replace captures: 0: ... with scope: ...
add more tests

jrappen added 3 commits

November 13, 2022 23:22


          [ActionScript] clean up syntax

cfe83a4

- update to syntax v2
- add variables
- move comments to prototype context
- add named contexts for strings and comments


          [ActionScript] fix test

644e44a


          [ActionScript] update build file

fffd402

Contributor Author

jrappen commented Nov 18, 2022

To anybody reviewing, you can check I haven't changed the regex for the variables by reversing my changes:

remove whitespace
replace (?:...) with the original (...)

jrappen changed the title ~~[ActionScript] clean up syntax~~ [ActionScript] refactor syntax

jrappen added 4 commits

November 20, 2022 00:55


          Update ActionScript.sublime-syntax

ef8b621


          [ActionScript] add some tests

b20d13c


          Update syntax_test_as.as

add6a42


          Update ActionScript.sublime-syntax

16c0bc8

deathaxe requested changes

View reviewed changes

ActionScript/ActionScript.sublime-syntax Outdated

Comment on lines 738 to 739

		- match: \b(?:{{keywords}})\b
		scope: keyword.control.actionscript

Collaborator

deathaxe Dec 8, 2022

How about a dedicated keywords context to apply more detailed scopes such as keyword.control.conditional or keyword.control.loop ... just to get those inline with other syntaxes?

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated

Comment on lines 883 to 890

+                  - match: |-
+                      (?x:
+                        (\d+\.?\d*|\.\d+)
+                        ({{constant_numeric_exponent}})?
+                        (L|l|UL|ul|u|U|F|f)?
+                      )
+                    scope: meta.number.actionscript
+                    captures:

Collaborator

deathaxe Dec 8, 2022

Does it make sense to try to distinguish floats from integers?

Contributor Author

jrappen Dec 8, 2022

I guess, will take another look.

ActionScript/ActionScript.sublime-syntax

+                  - match: |-
+                      (?x:
+                        (\d+\.?\d*|\.\d+)
+                        ({{constant_numeric_exponent}})?

Collaborator

deathaxe Dec 8, 2022

Exponent is used once only. Is it really worth a variable then?

Contributor Author

jrappen Dec 8, 2022

A leftover from halfway through the re-write as I wasn't sure if I'd need it again maybe. Might keep it when distinguishing floats and integers.

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

deathaxe reviewed

View reviewed changes

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

jrappen and others added 4 commits

December 8, 2022 19:57


          Update ActionScript/ActionScript.sublime-syntax

efa05f0

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

7b7763a

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

c4595d7

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

b43ece0

Co-authored-by: deathaxe <deathaxe82@googlemail.com>

deathaxe reviewed

View reviewed changes

ActionScript/ActionScript.sublime-build Outdated Show resolved Hide resolved

deathaxe reviewed

View reviewed changes

ActionScript/ActionScript.sublime-build Outdated Show resolved Hide resolved

deathaxe reviewed

View reviewed changes

ActionScript/ActionScript.sublime-build Show resolved Hide resolved


          Update ActionScript.sublime-syntax

01f6d77

Contributor Author

jrappen commented Dec 10, 2022

I'll address leftover comments later today.


          Update ActionScript.sublime-syntax

5198b89

deathaxe reviewed

View reviewed changes

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

ActionScript/ActionScript.sublime-syntax Outdated Show resolved Hide resolved

jrappen and others added 8 commits

December 10, 2022 12:29


          Update ActionScript/ActionScript.sublime-syntax

fb74211

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

269bd16

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

fde72e8

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

79d06b2

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript/ActionScript.sublime-syntax

65afe84

Co-authored-by: deathaxe <deathaxe82@googlemail.com>


          Update ActionScript.sublime-syntax

6c931d8


          Update ActionScript.sublime-syntax

0dd35dc


          Update ActionScript.sublime-build

dd7a70b

jrappen marked this pull request as draft

December 10, 2022 12:21

jrappen added 4 commits

December 10, 2022 20:33


          Update ActionScript.sublime-syntax

74204a4


          Update ActionScript.sublime-syntax

00aed39


          Update syntax_test_as.as

610b1c5


          Update ActionScript.sublime-syntax

c5bc385

Contributor Author

jrappen commented Jan 23, 2023 •

edited

I still have to do the keywords context and update the numbers stuff.

jrappen added 4 commits

January 23, 2023 13:10


          Update syntax_test_as.as

aa6ae1e


          Update ActionScript.sublime-syntax

a7de207


          Update syntax_test_as.as

3e360a8


          Update syntax_test_as.as

638620f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment