Skip to content

Improved highlighting for keywords and macro syntax #33

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

Merged
mikecentola merged 2 commits into from
Nov 30, 2021
Merged

Improved highlighting for keywords and macro syntax #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f6eff6
Allow optional spaces after certain keywords
zachallaun Sep 29, 2021
ab2a3ea
Give syntax precedence to brackets/keywords/operators
zachallaun Sep 29, 2021
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
14 changes: 14 additions & 0 deletions samplenc/sample-colors.nc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,20 @@ G04 P500

IF[#898EQ#996]GOTO19999

IF [123 LE ABS[#452 + 1234]] THEN
(SOMETHING)
ELSE
(SOMETHING ELSE)
ENDIF

WHILE [#123 LT 7.5] DO 5
(SOMETHING HERE)
END 5

WHILE [#123 LT 7.5] DO5
(SOMETHING HERE)
END5

#[#8 + 7.]=0

G51 P[ #5 * 1000 ]
Expand Down
22 changes: 11 additions & 11 deletions syntaxes/gcode.tmLanguage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
"include": "#comments"
},
{
"include": "#speedsfeeds"
"include": "#bracket-expression"
},
{
"include": "#prognumbers"
"include": "#keywords"
},
{
"include": "#coords"
"include": "#operators"
},
{
"include": "#tools"
"include": "#speedsfeeds"
},
{
"include": "#modifiers"
"include": "#prognumbers"
},
{
"include": "#macrovars"
"include": "#coords"
},
{
"include": "#keywords"
"include": "#tools"
},
{
"include": "#operators"
"include": "#modifiers"
},
{
"include": "#bracket-expression"
"include": "#macrovars"
}
]
},
Expand All @@ -57,7 +57,7 @@
"keywords": {
"patterns": [
{
"match": "(GOTO(?>\\d+))|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO(?>\\d+))|(WHILE)|(WH)|(END(?>\\d+))|(AND)|(OR)|(XOR)",
"match": "(GOTO(?>\\d+))|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO ?(?>\\d+))|(WHILE)|(WH)|(END ?(?>\\d+))|(AND)|(OR)|(XOR)|(THEN)|(ELSE)|(ENDIF)",
"name": "keyword.control.gcode"
},
{
Expand Down Expand Up @@ -219,4 +219,4 @@
]
}
}
}
}