Skip to content

Add highlighting for C++23 universal character names #708

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
eisenwave wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add highlighting for C++23 universal character names #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion autogenerated/cpp.embedded.macro.tmLanguage.json
View file
Open in desktop

Large diffs are not rendered by default.

402 changes: 201 additions & 201 deletions autogenerated/cpp.tmLanguage.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions language_examples/feature_universal_character_names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
void test() {
const char* a = "hello \u{41} world";
const char* b = "emoji \u{1F600}";
const char* c = "\u{0A} newline escape";
const char* d = "\N{LATIN SMALL LETTER A}";
const char* e = "\N{DIGIT ZERO}";
const char* f = "value: \N{PLUS SIGN}";
const char* g = "\u0041";
const char* h = "\U00000041";
}
360 changes: 360 additions & 0 deletions language_examples/feature_universal_character_names.spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,360 @@
- source: void
scopesBegin:
- meta.function.definition
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: test
scopesBegin:
- meta.head.function.definition
scopes:
- entity.name.function.definition
- source: (
scopes:
- punctuation.section.parameters.begin.bracket.round
- source: )
scopes:
- punctuation.section.parameters.end.bracket.round
- source: '{'
scopes:
- punctuation.section.block.begin.bracket.curly.function.definition
scopesEnd:
- meta.head.function.definition
- source: const
scopesBegin:
- meta.body.function.definition
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: a
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: 'hello '
- source: '\u{41}'
scopes:
- constant.character.escape
- source: ' world'
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: b
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: 'emoji '
- source: '\u{1F600}'
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: c
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: '\u{0A}'
scopes:
- constant.character.escape
- source: ' newline escape'
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: d
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: '\N{LATIN SMALL LETTER A}'
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: e
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: '\N{DIGIT ZERO}'
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: f
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: 'value: '
- source: '\N{PLUS SIGN}'
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: g
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: \u0041
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: const
scopesBegin:
- meta.assignment
scopes:
- storage.modifier.specifier.const
- source: char
scopes:
- meta.qualified-type
- storage.type.primitive
- storage.type.built-in.primitive
- source: '*'
scopes:
- storage.modifier.pointer
- source: h
scopesBegin:
- meta.assignment
scopes:
- variable.lower-case
- variable.other.assignment
- source: '='
scopes:
- keyword.operator.assignment
scopesEnd:
- meta.assignment
- source: '"'
scopesBegin:
- string.quoted.double
scopes:
- punctuation.definition.string.begin
- source: \U00000041
scopes:
- constant.character.escape
- source: '"'
scopes:
- punctuation.definition.string.end
scopesEnd:
- meta.assignment
- string.quoted.double
- source: ;
scopes:
- punctuation.terminator.statement
- source: '}'
scopes:
- punctuation.section.block.end.bracket.curly.function.definition
2 changes: 1 addition & 1 deletion main/main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
grammar.import(PathFor[:pattern]["std_space"])
std_space = grammar[:std_space]
basic_space = zeroOrMoreOf(match: /\s/, dont_back_track?: true).lookBehindToAvoid(@standard_character)
universal_character = Pattern.new(/\\u[0-9a-fA-F]{4}/).or(/\\U[0-9a-fA-F]{8}/)
universal_character = Pattern.new(/\\u[0-9a-fA-F]{4}/).or(/\\U[0-9a-fA-F]{8}/).or(/\\u\{[0-9a-fA-F]+\}/).or(/\\N\{[^}\n]+\}/)
first_character = Pattern.new(/[a-zA-Z_]/).or(universal_character)
subsequent_character = Pattern.new(/[a-zA-Z0-9_]/).or(universal_character)
identifier = grammar[:identifier] = first_character.then(zeroOrMoreOf(subsequent_character))
Expand Down
2 changes: 1 addition & 1 deletion main/patterns/backslash_escapes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def backslash_escapes
LegacyPattern.new(
match: "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?] |\n[0-3][0-7]{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
match: "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?] |\n[0-3][0-7]{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} |\nu\\{[0-9a-fA-F]+\\} |\nN\\{[^}]+\\} )",
name: "constant.character.escape"
)
end