Skip to content

Overhaul GML highlighting #4184

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

Open
wants to merge 68 commits into
base: main
Choose a base branch
from
Open

Overhaul GML highlighting #4184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
d88ae9d
feat(gml) proper grammar over keyword list!
thennothinghappened Dec 14, 2024
1f7f55e
feat(gml) support all GML jsdoc annotations
thennothinghappened Dec 14, 2024
b3c9877
fix(gml) start untangling oddities from GM manual
thennothinghappened Dec 14, 2024
ed25ada
fix(gml) manual untangling pt2
thennothinghappened Dec 14, 2024
1b5c513
fix(gml) change oddities resolved
thennothinghappened Dec 14, 2024
7b2550a
fix(gml) final remaining incorrect symbols
thennothinghappened Dec 14, 2024
e974803
fix(gml) correct built-ins highlight type
thennothinghappened Dec 14, 2024
de0affb
fix(gml) `gml.css` updates for lang changes
thennothinghappened Dec 14, 2024
d55c5c8
fix(gml) use `property` scope for prop access
thennothinghappened Dec 14, 2024
3046802
fix(gml) more accurate jsdoc highlighting
thennothinghappened Dec 14, 2024
d9fc974
fix(gml) update test for GML highlighting output
thennothinghappened Dec 14, 2024
b221433
docs(gml) update `gml.js` info banner
thennothinghappened Dec 14, 2024
a6fb18f
docs(gml) fix incorrect desc. on `lateConcat`
thennothinghappened Dec 14, 2024
4e5ff27
refactor(gml) regex naming conventions
thennothinghappened Dec 14, 2024
e057d42
refactor(gml) prefer `scope` over `className`
thennothinghappened Dec 14, 2024
3b0d288
fix(gml) prefer `$` over `\n` where applicable
thennothinghappened Dec 14, 2024
78afe09
fix(gml) more specific scope for function decl
thennothinghappened Dec 14, 2024
6cd62fb
fix(gml) `title.function` is scope not match
thennothinghappened Dec 14, 2024
c167592
fix(gml) `function` keyword stealing function decl
thennothinghappened Dec 14, 2024
3c4b636
fix(gml) other instances of `function` -> `title.function`
thennothinghappened Dec 14, 2024
e6e40cd
fix(gml) update `gml.css` theme to colour func changes
thennothinghappened Dec 14, 2024
be3d944
fix(gml) correct scopes for jsdoc tags
thennothinghappened Dec 14, 2024
12ec813
fix(gml) correct doctype tag for `@returns`
thennothinghappened Dec 14, 2024
31b3fc0
fix(gml) constants not as literals
thennothinghappened Dec 14, 2024
d011d6a
fix(gml) function invokation more specific
thennothinghappened Dec 14, 2024
a9a005e
fix(gml) escapes should be `char.escape`
thennothinghappened Dec 14, 2024
088ace7
fix(gml) numbers are numbers!
thennothinghappened Dec 14, 2024
64dc5b6
fix(gml) instance vars are just variables
thennothinghappened Dec 14, 2024
57c830f
fix(gml) redundant case sensitivity decl
thennothinghappened Dec 14, 2024
15ad0c4
fix(gml) string template `{}` is `subst`
thennothinghappened Dec 14, 2024
448a624
refactor(gml) remove unneeded `lateConcat` util
thennothinghappened Dec 15, 2024
6bc0f85
fix(gml) numerical string templates are `subst`
thennothinghappened Dec 15, 2024
f223bdb
fix(gml) preproc is `meta`
thennothinghappened Dec 15, 2024
5d4d029
fix(gml) `gml.css` theme various colour fixes
thennothinghappened Dec 15, 2024
74c324c
fix(gml) built ins not being highlighted in expr
thennothinghappened Dec 15, 2024
bb1789f
feat(gml) much more extensive test
thennothinghappened Dec 15, 2024
0a00d16
fix(gml) don't match string chars one by one
thennothinghappened Dec 15, 2024
6d70f6f
fix(gml) update test accordingly to string change
thennothinghappened Dec 15, 2024
aa00826
fix(gml) remove useless `global` special `.` case
thennothinghappened Dec 15, 2024
71a5d32
Merge branch 'highlightjs:main' into main
thennothinghappened Dec 15, 2024
38c63e6
fix(gml) chuck out redundant `?` on optional spaces
thennothinghappened Dec 15, 2024
a1097fd
fix(gml) remove obsolete `#define` keyword
thennothinghappened Dec 15, 2024
5221c23
fix(gml) template strings cannot contain newlines
thennothinghappened Dec 15, 2024
1b9cecf
feat(gml) fine tune some relevances
thennothinghappened Dec 15, 2024
66e9ef6
fix(gml) `@""` strings are not unique actually!
thennothinghappened Dec 15, 2024
0fd9d05
fix(gml) nest `subst` scope instead of workaround
thennothinghappened Dec 16, 2024
1f0bcc4
fix(gml) jsdoc `@param` varname as `params`
thennothinghappened Dec 16, 2024
a746ca1
fix(gml) update theme for jsdoc changes
thennothinghappened Dec 16, 2024
1507cf2
fix(gml) update markup test
thennothinghappened Dec 16, 2024
32d3db8
fix(gml) ds_map accessor > ternary
thennothinghappened Jan 1, 2025
4ab4edc
Merge branch 'main' into main
thennothinghappened Mar 7, 2025
f8dc9a6
fix(gml) redundant `/$/` match
thennothinghappened Mar 17, 2025
bb2db9c
fix(gml) move whitespace out of macro scope
thennothinghappened Mar 17, 2025
10bd2a9
feat(gml) macro config overrides
thennothinghappened Mar 17, 2025
fb906c6
fix(gml) correct macro override syntax
thennothinghappened Mar 17, 2025
843252f
fix(gml) `punctuation` scope for template strings
thennothinghappened Mar 17, 2025
7030375
fix(gml) update test w/ punctuation
thennothinghappened Mar 18, 2025
0c1f654
fix(gml) identical variant scopes
thennothinghappened Mar 18, 2025
d5cd335
fix(gml) prefer `match` over `begin` with no `end`
thennothinghappened Mar 18, 2025
6b87e68
fix(gml) prefer regex literals for matches
thennothinghappened Mar 18, 2025
dbad147
fix(gml) less aggressive string escapes
thennothinghappened Mar 18, 2025
8d6f0ee
fix(gml) function calls are not relevant to detect
thennothinghappened Mar 18, 2025
ed906f6
fix(gml) string literal where regex should be
thennothinghappened Mar 18, 2025
7a67241
fix(gml) again move identical variant info to top
thennothinghappened Mar 18, 2025
bfc1dd8
docs: add GML to supported language list
thennothinghappened Mar 18, 2025
e5a155c
Merge branch 'main' into main
thennothinghappened Mar 18, 2025
ccbf310
(docs) add GML to changelog
thennothinghappened Mar 18, 2025
e0b4431
enh(gml) restore & update built-in function list
thennothinghappened Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ New Grammars:
Core Grammars:

- enh(csp) add missing directives / keywords from MDN (7 more) [Max Liashuk][]
- enh(gml) major overhaul to the GameMaker Language grammar [orca][]

CONTRIBUTORS

[Josh Marchand]: https://github.com/yHSJ
[Max Liashuk]: https://github.com/probil
[orca]: https://github.com/thennothinghappened

## Version 11.11.1

Expand Down
1 change: 1 addition & 0 deletions SUPPORTED_LANGUAGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ The table below shows the full list of languages (and corresponding classes/alia
| Fortran | fortran, f90, f95 | |
| FunC | func | [highlightjs-func](https://github.com/highlightjs/highlightjs-func) |
| G-Code | gcode, nc | |
| GameMaker Language | gml | |
| Gams | gams, gms | |
| GAUSS | gauss, gss | |
| GDScript | godot, gdscript | [highlightjs-gdscript](https://github.com/highlightjs/highlightjs-gdscript) |
Expand Down
Loading