Compare commits

...

3 commits

Author SHA1 Message Date
Bruno BELANYI f6e1266493 Consider module as function call for highlighting
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Their semantic is closer to a function call (like i.e: Bazel rules)
rather than a module/namespace.

Similarly for their properties, which are more like parameters than
members.
2024-04-10 15:21:07 +00:00
Bruno BELANYI be1e3f07d3 Make 'line_comment' more explicit about newlines
Because of the way regular expressions work, they were already bounded
at newlines here, but explicit is better than implicit :-).
2024-04-10 15:20:29 +00:00
Bruno BELANYI 73b0797891 Add builtins highlighting 2024-04-10 15:20:29 +00:00
8 changed files with 47 additions and 14 deletions

View file

@ -23,7 +23,7 @@ module.exports = grammar({
$.module,
),
line_comment: (_) => seq("//", /.*/),
line_comment: (_) => seq("//", /[^\n]*/),
block_comment: (_) => seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, '/'),

View file

@ -42,11 +42,19 @@
(identifier) @variable
(module
type: (identifier) @module)
type: (identifier) @function.call)
(module
(property
field: (identifier) @variable.member))
field: (identifier) @variable.parameter))
; }}}
; Built-ins {{{
[
(unset)
"default"
] @variable.builtin
(selection_type) @function.builtin
; }}}
; Expressions {{{

2
src/grammar.json generated
View file

@ -30,7 +30,7 @@
},
{
"type": "PATTERN",
"value": ".*"
"value": "[^\\n]*"
}
]
},

View file

@ -85,6 +85,23 @@ Block comment with asterisks
--------------------------------------------------------------------------------
(source_file
(block_comment))
================================================================================
Block comment (multiline)
================================================================================
/*
This
is
a
long
comment
*/
--------------------------------------------------------------------------------
(source_file
(block_comment))

View file

@ -0,0 +1,8 @@
foo = select(soong_config_variable("my_namespace", "my_var"), {
// ^ function.builtin
"foo": unset,
// ^ variable.builtin
default: select(variant("VARIANT"), {}),
// <- variable.builtin
// ^ function.builtin
})

View file

@ -1,21 +1,21 @@
foo {}
// <- module
// <- function.call
foo ()
// <- module
// <- function.call
foo {
// <- module
// <- function.call
field: 12,
// <- variable.member
// <- variable.parameter
another_field: 27,
// <- variable.member
// <- variable.parameter
}
foo (
// <- module
// <- function.call
field = 42,
// <- variable.member
// <- variable.parameter
done = false,
// <- variable.member
// <- variable.parameter
)

View file

@ -1,6 +1,6 @@
foo {
field: {
// <- variable.member
// <- variable.parameter
key: 42,
// <- property
},

View file

@ -11,5 +11,5 @@ select = 42
// Or module property
foo {
select: 42,
// <- variable.member
// <- variable.parameter
}