Skip to content
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

Changes and fixes to grammar: Number literals, preprocessor, string #57

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Changes and fixes to grammar: Number literals, preprocessor, string #57

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0bd54b4
Fix 'fixed point number' regex
akberg Apr 29, 2024
9c48f9a
Add rule for double-quoted strings
akberg Apr 29, 2024
38af980
Improved matching, naming of preprocessor keywords
akberg Apr 29, 2024
a1f1cd2
Removed trailing whitespace
akberg Apr 29, 2024
9bbdf1f
1-9 -> 0-9 for decimals
akberg Apr 29, 2024
7350294
In response to comment, use \\d instead [0-9]
akberg May 3, 2024
4eac2c7
Formatting fix
akberg May 3, 2024
566fe26
Special case of #version (not strict on valid version numbers)
akberg May 3, 2024
7cb2459
Move preproc before block comments for precedence
akberg May 3, 2024
07db66f
Error preprocessor
akberg May 3, 2024
a615c19
Export block comment to repository level
akberg May 3, 2024
4f33457
Extension and error preproc with block comments
akberg May 3, 2024
6b1ccf9
Added keywords warn and require
akberg May 3, 2024
606c624
Nvm about whitespace around #version
akberg May 3, 2024
f86ab5f
More precise naming
akberg May 3, 2024
82d232b
Naming
akberg May 3, 2024
645152c
Add line preprocessor
akberg May 3, 2024
e6aafed
Add preprocessor define
akberg May 5, 2024
7d6fc7a
In response to comment, use \d instead of [0-9]
akberg May 9, 2024
04254fc
Add back highlighting on all # identifiers to allow custom directives
akberg Jun 4, 2024
5f8e2c0
Merge branch 'dev'
akberg Jun 4, 2024
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
189 changes: 179 additions & 10 deletions syntaxes/glsl.language.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,182 @@
"scopeName": "source.glsl",
"patterns": [
{
"comment": "BLOCK COMMENT",
"name": "comment.block.glsl",
"begin": "\\/\\*",
"end": "\\*\\/"
"comment": "PREPROCESSOR GL VERSION",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*#(\\s|(\\/\\*.*?\\*\\/))*version)((\\s|(\\/\\*.*?\\*\\/))+[1-9]\\d*)((\\s|(\\/\\*.*?\\*\\/))*(es|core|compatibility))?",
"captures": {
"1": {
"name": "keyword.control.directive.version.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"6": {
"name": "constant.numeric.version.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"9": {
"name": "storage.modifier.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
}
}
},
{
"comment": "PREPROCESSOR LINE",
"name": "directive.preprocessor.glsl",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*#(\\s|(\\/\\*.*?\\*\\/))*line)((\\s|(\\/\\*.*?\\*\\/))+[1-9]\\d*)((\\s|(\\/\\*.*?\\*\\/))+[1-9]\\d*)?",
"captures": {
"1": {
"name": "keyword.control.directive.line.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"6": {
"name": "constant.numeric.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"9": {
"name": "constant.numeric.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
}
}
},
{
"comment": "PREPROCESSOR ERROR",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*(#(\\s|(\\/\\*.*?\\*\\/))*error))\\s+(.+)",
"captures": {
"1": {
"name": "keyword.control.directive.error.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"7": {
"name": "string.unquoted.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
}
}
},
{
"comment": "PREPROCESSOR DEFINE",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*(#(\\s|(\\/\\*.*?\\*\\/))*define))((\\s|(\\/\\*.*?\\*\\/))*[_a-zA-Z]\\w*)(\\(\\s*(([_a-zA-Z]\\w+)(\\s*,\\s*([_a-zA-Z]\\w+)\\s*)*)?\\))?",
"captures": {
"1": {
"name": "keyword.control.directive.error.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"7": {
"name": "entity.name.function",
"patterns": [
{
"include": "#block-comment"
}
]
},
"12": {
"name": "variable.parameter.glsl"
},
"14": {
"name": "variable.parameter.glsl"
}
}
},
{
"comment": "PREPROCESSOR EXTENSION",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*#(\\s|(\\/\\*.*?\\*\\/))*extension)((\\s|(\\/\\*.*?\\*\\/))+\\w+)((\\s|(\\/\\*.*?\\*\\/))+:)((\\s|(\\/\\*.*?\\*\\/))+(enable|disable|require|warn))\\b",
"captures": {
"1": {
"name": "keyword.control.directive.extension.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"6": {
"name": "variable.extension.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"9": {
"name": "keyword.operator.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
},
"12": {
"name": "constant.language.extension.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
}
}
},
{
"comment": "PREPROCESSOR KEYWORD",
"match": "^((\\s|(\\/\\*.*?\\*\\/))*#(\\s|(\\/\\*.*?\\*\\/))*(defined|define|undef|if|ifdef|ifndef|else|elif|endif|pragma|line|include|extension|version|error|(\\w+)|#?))\\b",
"captures": {
"1": {
"name": "keyword.control.directive.glsl",
"patterns": [
{
"include": "#block-comment"
}
]
}
}
},
{
"include": "#block-comment"
},
{
"comment": "SINGLE LINE COMMENT",
"name": "comment.line.double-slash.glsl",
"begin": "//",
"end": "$"
},
{
"comment": "PREPROCESSOR",
"name": "meta.preprocessor.glsl",
"match": "#.*?($|(?=(\\/\\/|\\/\\*)))"
{
"comment": "DOUBLE-QUOTED STRING",
"name": "string.quoted.double.glsl",
"begin": "\"",
"end": "\""
},
{
"comment": "BOOL LITERAL",
Expand All @@ -36,7 +197,7 @@
{
"comment": "FIXED POINT NUMBER",
"name": "constant.numeric.glsl",
"match": "([1-9]\\d*|0[0-7]*|0[xX](\\d|[a-fA-F])+)[uU]?"
"match": "(([1-9]\\d*)|(0[xX][\\da-fA-F]+)|(0[0-7]*))[uU]?"
}
]
},
Expand Down Expand Up @@ -174,5 +335,13 @@
"name": "variable.glsl",
"match": "\\b([a-zA-Z_]\\w*)\\b"
}
]
],
"repository": {
"block-comment": {
"comment": "BLOCK COMMENT",
"name": "comment.block.glsl",
"begin": "\\/\\*",
"end": "\\*\\/"
}
}
}