mirror of
https://github.com/helix-editor/helix.git
synced 2024-11-25 19:03:30 +04:00
c/c++ highlighting: various tweaks
- treat `restrict`/`_Atomic` like `const`/`volatile` => @keyword.storage.modifier - highlight `unsigned int` as builtin => @type.builtin - recognize `static_cast` and friends => @keyword - `template` is a kind of entity like `typename` => @keyword.storage.type - many declaration modifiers have nothing to do with storage/types (explicit, friend, access specifiers, inline in C++) => @keyword - fix floats highlighted as integer => @constant.numeric
This commit is contained in:
parent
a3ed9169df
commit
aef37d43d7
@ -8,11 +8,9 @@
|
||||
] @keyword.storage.type
|
||||
|
||||
[
|
||||
"const"
|
||||
"extern"
|
||||
"inline"
|
||||
"register"
|
||||
"volatile"
|
||||
(type_qualifier)
|
||||
(storage_class_specifier)
|
||||
] @keyword.storage.modifier
|
||||
|
||||
@ -107,7 +105,7 @@
|
||||
(system_lib_string) @string
|
||||
|
||||
(null) @constant
|
||||
(number_literal) @constant.numeric.integer
|
||||
(number_literal) @constant.numeric
|
||||
(char_literal) @constant.character
|
||||
|
||||
(call_expression
|
||||
@ -133,7 +131,7 @@
|
||||
(statement_identifier) @label
|
||||
(type_identifier) @type
|
||||
(primitive_type) @type.builtin
|
||||
(sized_type_specifier) @type
|
||||
(sized_type_specifier) @type.builtin
|
||||
|
||||
((identifier) @constant
|
||||
(#match? @constant "^[A-Z][A-Z\\d_]*$"))
|
||||
|
@ -1,5 +1,11 @@
|
||||
; Functions
|
||||
|
||||
; These casts are parsed as function calls, but are not.
|
||||
((identifier) @keyword (#eq? @keyword "static_cast"))
|
||||
((identifier) @keyword (#eq? @keyword "dynamic_cast"))
|
||||
((identifier) @keyword (#eq? @keyword "reinterpret_cast"))
|
||||
((identifier) @keyword (#eq? @keyword "const_cast"))
|
||||
|
||||
(call_expression
|
||||
function: (qualified_identifier
|
||||
name: (identifier) @function))
|
||||
@ -63,7 +69,6 @@
|
||||
"co_yield"
|
||||
"concept"
|
||||
"delete"
|
||||
"final"
|
||||
"new"
|
||||
"operator"
|
||||
"requires"
|
||||
@ -95,22 +100,27 @@
|
||||
"class"
|
||||
"namespace"
|
||||
"typename"
|
||||
"template"
|
||||
] @keyword.storage.type
|
||||
|
||||
[
|
||||
"constexpr"
|
||||
"constinit"
|
||||
"consteval"
|
||||
"mutable"
|
||||
] @keyword.storage.modifier
|
||||
|
||||
; Modifiers that aren't plausibly type/storage related.
|
||||
[
|
||||
"explicit"
|
||||
"friend"
|
||||
"mutable"
|
||||
"virtual"
|
||||
(virtual_specifier) ; override/final
|
||||
"private"
|
||||
"protected"
|
||||
"public"
|
||||
"override"
|
||||
"template"
|
||||
"virtual"
|
||||
] @keyword.storage.modifier
|
||||
"inline" ; C++ meaning differs from C!
|
||||
] @keyword
|
||||
|
||||
; Strings
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user