Compare commits

..

3 commits

Author SHA1 Message Date
Bruno BELANYI 9012a19840 WIP: PLAYGROUND
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2024-04-22 09:57:56 +00:00
Bruno BELANYI 93a71d095b Add more generated files attributes
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2024-04-22 09:54:16 +00:00
Bruno BELANYI bc4db561ca Bump flake inputs
All checks were successful
ci/woodpecker/push/check Pipeline was successful
This means regenerating all the tree-sitter files, and adding newly
generated outputs (mostly new bindings).

The `--apply-all-captures` flag has been removed, it is now the default
(and only) matching behaviour.
2024-04-22 09:49:18 +00:00
18 changed files with 3636 additions and 2958 deletions

View file

@ -1,7 +1,7 @@
[package]
name = "tree-sitter-bp"
description = "Blueprint grammar for the tree-sitter parsing library"
version = "0.5.0"
version = "0.3.0"
keywords = ["incremental", "parsing", "android", "blueprint"]
categories = ["parsing", "text-editors"]
repository = "https://git.belanyi.fr/ambroisie/tree-sitter-bp"

View file

@ -14,5 +14,5 @@ update-tests: all
.PHONY: playground
playground:
nix shell pkgs#emscripten --command tree-sitter build-wasm
nix shell pkgs#emscripten --command tree-sitter build --wasm
tree-sitter playground

View file

@ -35,11 +35,10 @@ pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
// Uncomment these to include any queries that this grammar contains
pub const FOLDS_QUERY: &'static str = include_str!("../../queries/folds.scm");
pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
pub const INDENTS_QUERY: &'static str = include_str!("../../queries/indents.scm");
pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
#[cfg(test)]
mod tests {

View file

@ -61,10 +61,6 @@
export NVIM_TREESITTER_TEXTOBJECTS='${pkgs.vimPlugins.nvim-treesitter-textobjects}'
export NVIM_TREESITTER_PARSER='${pkgs.vimPlugins.nvim-treesitter.grammarToPlugin self.packages.${system}.tree-sitter-bp}'
# FIXME: not sure why, but I get different behaviour when left untouched
XDG_CONFIG_HOME=$(mktemp -d)
export XDG_CONFIG_HOME
nvim --headless --noplugin -u ${scripts/minimal_init.lua} \
-c "PlenaryBustedDirectory test/ { minimal_init = '${./scripts/minimal_init.lua}' }"
'';
@ -78,9 +74,8 @@
${pkgs.jq}/bin/jq ".version = \"''${NEW_VERSION}\"" package.json > package.json.tmp
mv package.json.tmp package.json
${pkgs.gnused}/bin/sed -i -e "s/version = \"[0-9.]\\+\"/version = \"''${NEW_VERSION}\"/" Cargo.toml
${pkgs.gnused}/bin/sed -i -e "s/version = \"[0-9.]\\+\"/version = \"''${NEW_VERSION}\"/" pyproject.toml
git add Cargo.toml package.json pyproject.toml
git add Cargo.toml package.json
echo "Release ''${NEW_VERSION}" | git commit -eF -
git tag -a "v''${NEW_VERSION}" -m "Release ''${NEW_VERSION}"
'';
@ -145,9 +140,7 @@
bump-version
nodejs
nvim-test-runner
# FIXME: waiting on #301336
# (tree-sitter.override { webUISupport = true; })
tree-sitter
(tree-sitter.override { webUISupport = true; })
];
inherit (checks.pre-commit) shellHook;

View file

@ -1,12 +1,8 @@
function commaSeparatedOptTrailing(elem) {
function commaSeparated(elem) {
return seq(elem, repeat(seq(",", elem)), optional(","))
}
function commaSeparatedNoTrailing(elem) {
return seq(elem, repeat(seq(",", elem)))
}
function commaSeparatedTrailing(elem) {
function trailingCommaSeparated(elem) {
return repeat(seq(elem, ","))
}
@ -48,7 +44,7 @@ module.exports = grammar({
_old_module: ($) => seq(
field("type", $.identifier),
"{",
optional(commaSeparatedOptTrailing(
optional(commaSeparated(
alias(field("property", $._colon_property), $.property)
)),
"}",
@ -57,7 +53,7 @@ module.exports = grammar({
_new_module: ($) => seq(
field("type", $.identifier),
"(",
optional(commaSeparatedOptTrailing(
optional(commaSeparated(
alias(field("property", $._equal_property), $.property)
)),
")",
@ -125,53 +121,54 @@ module.exports = grammar({
select_expression: ($) => seq(
"select",
"(",
$.select_value,
choice($.select_value, $.soong_config_variable),
",",
$.select_cases,
")",
),
select_value: ($) => choice(
$.condition,
seq("(", commaSeparatedOptTrailing($.condition), ")"),
select_value: ($) => seq(
field("type", alias(
choice("product_variable", "release_variable", "variant"),
$.selection_type,
)),
"(",
field("condition", $._string_literal),
")",
),
condition: ($) => seq(
field("name", $.identifier),
soong_config_variable: ($) => seq(
field("type", alias("soong_config_variable", $.selection_type)),
"(",
field("arguments", optional(commaSeparatedNoTrailing($._string_literal))),
field(
"condition",
seq(
field("namespace", $._string_literal),
",",
field("variable", $._string_literal),
),
),
")",
),
select_cases: ($) => seq(
"{",
optional(commaSeparatedTrailing($.select_case)),
optional(trailingCommaSeparated($.select_case)),
// default *must* be the last one, enforced at parse-time...
optional(seq(alias($.default_case, $.select_case), ",")),
"}",
),
select_case: ($) => seq(
field("pattern", $.select_pattern),
field("pattern", $._string_literal),
":",
field("value", $._case_value)
),
select_pattern: ($) => choice(
$._select_pattern,
seq("(", commaSeparatedOptTrailing($._select_pattern), ")"),
),
_select_pattern: ($) => choice(
$._string_literal,
$.boolean_literal,
alias("any", $.any),
$.pattern_binding,
alias("default", $.default),
),
pattern_binding: ($) => seq(
field("value", alias("any", $.any)),
field("operator", alias("@", $.operator)),
field("binding", $.identifier),
default_case: ($) => seq(
field("pattern", alias("default", $.default)),
":",
field("value", $._case_value),
),
_case_value: ($) => choice(
@ -181,13 +178,13 @@ module.exports = grammar({
list_expression: ($) => seq(
"[",
optional(commaSeparatedOptTrailing(field("element", $._expr))),
optional(commaSeparated(field("element", $._expr))),
"]",
),
map_expression: ($) => seq(
"{",
optional(commaSeparatedOptTrailing(
optional(commaSeparated(
alias(field("property", $._colon_property), $.property)
)),
"}",

View file

@ -1,6 +1,6 @@
{
"name": "tree-sitter-bp",
"version": "0.5.0",
"version": "0.3.0",
"description": "Blueprint grammar for tree-sitter",
"main": "bindings/node",
"types": "bindings/node",
@ -43,11 +43,6 @@
"file-types": [
"bp"
],
"folds": "queries/folds.scm",
"highlights": "queries/highlights.scm",
"indents": "queries/indents.scm",
"injections": "queries/injections.scm",
"tags": "queries/tags.scm",
"injection-regex": "bp"
}
]

View file

@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "tree-sitter-bp"
description = "Bp grammar for tree-sitter"
version = "0.5.0"
version = "0.0.1"
keywords = ["incremental", "parsing", "tree-sitter", "bp"]
classifiers = [
"Intended Audience :: Developers",

View file

@ -50,10 +50,8 @@
[
(unset)
(default)
(any)
] @variable.builtin
(condition
name: (identifier) @function.builtin)
(selection_type) @function.builtin
; }}}
; Expressions {{{

View file

@ -11,15 +11,6 @@
(select_expression
")" @indent.branch)
(select_value) @indent.begin
(select_value
")" @indent.branch)
(select_pattern
"(" @indent.begin)
(select_pattern
")" @indent.branch)
(select_cases) @indent.begin
(select_cases
"}" @indent.branch)

View file

@ -9,9 +9,6 @@
(assignment
left: (identifier) @local.definition.var)
(pattern_binding
binding: (identifier) @local.definition.var)
(identifier) @local.reference
; vim: sw=2 foldmethod=marker

257
src/grammar.json generated
View file

@ -468,10 +468,19 @@
"type": "STRING",
"value": "("
},
{
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "select_value"
},
{
"type": "SYMBOL",
"name": "soong_config_variable"
}
]
},
{
"type": "STRING",
"value": ","
@ -487,73 +496,66 @@
]
},
"select_value": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "type",
"content": {
"type": "ALIAS",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "condition"
"type": "STRING",
"value": "product_variable"
},
{
"type": "SEQ",
"members": [
"type": "STRING",
"value": "release_variable"
},
{
"type": "STRING",
"value": "variant"
}
]
},
"named": true,
"value": "selection_type"
}
},
{
"type": "STRING",
"value": "("
},
{
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "condition"
},
{
"type": "REPEAT",
"type": "FIELD",
"name": "condition",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "SYMBOL",
"name": "condition"
"name": "_string_literal"
}
]
}
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
},
{
"type": "STRING",
"value": ")"
}
]
}
]
},
"condition": {
"soong_config_variable": {
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "name",
"name": "type",
"content": {
"type": "SYMBOL",
"name": "identifier"
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "soong_config_variable"
},
"named": true,
"value": "selection_type"
}
},
{
@ -562,37 +564,29 @@
},
{
"type": "FIELD",
"name": "arguments",
"name": "condition",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "FIELD",
"name": "namespace",
"content": {
"type": "SYMBOL",
"name": "_string_literal"
}
},
{
"type": "REPEAT",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "FIELD",
"name": "variable",
"content": {
"type": "SYMBOL",
"name": "_string_literal"
}
]
}
}
]
},
{
"type": "BLANK"
}
]
}
@ -634,6 +628,32 @@
}
]
},
{
"type": "CHOICE",
"members": [
{
"type": "SEQ",
"members": [
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "default_case"
},
"named": true,
"value": "select_case"
},
{
"type": "STRING",
"value": ","
}
]
},
{
"type": "BLANK"
}
]
},
{
"type": "STRING",
"value": "}"
@ -648,7 +668,7 @@
"name": "pattern",
"content": {
"type": "SYMBOL",
"name": "select_pattern"
"name": "_string_literal"
}
},
{
@ -665,90 +685,13 @@
}
]
},
"select_pattern": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_select_pattern"
},
{
"default_case": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_select_pattern"
},
{
"type": "REPEAT",
"type": "FIELD",
"name": "pattern",
"content": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "SYMBOL",
"name": "_select_pattern"
}
]
}
},
{
"type": "CHOICE",
"members": [
{
"type": "STRING",
"value": ","
},
{
"type": "BLANK"
}
]
}
]
},
{
"type": "STRING",
"value": ")"
}
]
}
]
},
"_select_pattern": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "_string_literal"
},
{
"type": "SYMBOL",
"name": "boolean_literal"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "any"
},
"named": true,
"value": "any"
},
{
"type": "SYMBOL",
"name": "pattern_binding"
},
{
"type": "ALIAS",
"content": {
"type": "STRING",
@ -757,43 +700,17 @@
"named": true,
"value": "default"
}
]
},
"pattern_binding": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": ":"
},
{
"type": "FIELD",
"name": "value",
"content": {
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "any"
},
"named": true,
"value": "any"
}
},
{
"type": "FIELD",
"name": "operator",
"content": {
"type": "ALIAS",
"content": {
"type": "STRING",
"value": "@"
},
"named": true,
"value": "operator"
}
},
{
"type": "FIELD",
"name": "binding",
"content": {
"type": "SYMBOL",
"name": "identifier"
"name": "_case_value"
}
}
]

198
src/node-types.json generated
View file

@ -177,40 +177,6 @@
"named": true,
"fields": {}
},
{
"type": "condition",
"named": true,
"fields": {
"arguments": {
"multiple": true,
"required": false,
"types": [
{
"type": ",",
"named": false
},
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "raw_string_literal",
"named": true
}
]
},
"name": {
"multiple": false,
"required": true,
"types": [
{
"type": "identifier",
"named": true
}
]
}
}
},
{
"type": "integer_literal",
"named": true,
@ -321,42 +287,6 @@
}
}
},
{
"type": "pattern_binding",
"named": true,
"fields": {
"binding": {
"multiple": false,
"required": true,
"types": [
{
"type": "identifier",
"named": true
}
]
},
"operator": {
"multiple": false,
"required": true,
"types": [
{
"type": "operator",
"named": true
}
]
},
"value": {
"multiple": false,
"required": true,
"types": [
{
"type": "any",
"named": true
}
]
}
}
},
{
"type": "property",
"named": true,
@ -424,7 +354,15 @@
"required": true,
"types": [
{
"type": "select_pattern",
"type": "default",
"named": true
},
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "raw_string_literal",
"named": true
}
]
@ -507,40 +445,9 @@
{
"type": "select_value",
"named": true
}
]
}
},
{
"type": "select_pattern",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "any",
"named": true
},
{
"type": "boolean_literal",
"named": true
},
{
"type": "default",
"named": true
},
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "pattern_binding",
"named": true
},
{
"type": "raw_string_literal",
"type": "soong_config_variable",
"named": true
}
]
@ -549,16 +456,85 @@
{
"type": "select_value",
"named": true,
"fields": {},
"children": {
"multiple": true,
"fields": {
"condition": {
"multiple": false,
"required": true,
"types": [
{
"type": "condition",
"type": "interpreted_string_literal",
"named": true
},
{
"type": "raw_string_literal",
"named": true
}
]
},
"type": {
"multiple": false,
"required": true,
"types": [
{
"type": "selection_type",
"named": true
}
]
}
}
},
{
"type": "soong_config_variable",
"named": true,
"fields": {
"condition": {
"multiple": false,
"required": true,
"types": [
{
"type": ",",
"named": false
}
]
},
"namespace": {
"multiple": false,
"required": true,
"types": [
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "raw_string_literal",
"named": true
}
]
},
"type": {
"multiple": false,
"required": true,
"types": [
{
"type": "selection_type",
"named": true
}
]
},
"variable": {
"multiple": false,
"required": true,
"types": [
{
"type": "interpreted_string_literal",
"named": true
},
{
"type": "raw_string_literal",
"named": true
}
]
}
}
},
{
@ -628,10 +604,6 @@
"type": "]",
"named": false
},
{
"type": "any",
"named": true
},
{
"type": "default",
"named": true
@ -660,6 +632,10 @@
"type": "select",
"named": false
},
{
"type": "selection_type",
"named": true
},
{
"type": "true",
"named": false

5612
src/parser.c generated

File diff suppressed because it is too large Load diff

View file

@ -4,7 +4,6 @@ Select
foo = select(release_variable("RELEASE_TEST"), {
"d": "d2",
any: unset,
default: unset,
})
@ -16,21 +15,14 @@ foo = select(release_variable("RELEASE_TEST"), {
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)))
(selection_type)
(interpreted_string_literal))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(any))
(unset))
(select_case
(select_pattern
(default))
(default)
(unset))))))
================================================================================
@ -40,7 +32,6 @@ Select (soong config variable)
foo = select(soong_config_variable("my_namespace", "my_var"), {
"foo": unset,
"default": "bar",
any @ foo: unset,
})
--------------------------------------------------------------------------------
@ -50,27 +41,17 @@ foo = select(soong_config_variable("my_namespace", "my_var"), {
(identifier)
(operator)
(select_expression
(select_value
(condition
(identifier)
(soong_config_variable
(selection_type)
(interpreted_string_literal)
(interpreted_string_literal)))
(interpreted_string_literal))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(unset))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(pattern_binding
(any)
(operator)
(identifier)))
(unset))))))
(interpreted_string_literal)
(interpreted_string_literal))))))
================================================================================
Select (no default)
@ -91,25 +72,20 @@ foo = select(variant("arch"), {
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)))
(selection_type)
(interpreted_string_literal))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))))))
================================================================================
@ -126,9 +102,8 @@ foo = select(variant("VARIANT"), {})
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)))
(selection_type)
(interpreted_string_literal))
(select_cases))))
================================================================================
@ -151,29 +126,24 @@ foo = select(variant("VARIANT"), {
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)))
(selection_type)
(interpreted_string_literal))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(interpreted_string_literal)
(interpreted_string_literal))
(ERROR
(select_case
(default)
(unset)))
(select_case
(interpreted_string_literal)
(interpreted_string_literal))
(select_case
(select_pattern
(default))
(unset))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(interpreted_string_literal))))))
================================================================================
@ -193,16 +163,14 @@ foo = select(variant(), {
(operator)
(select_expression
(select_value
(condition
(identifier)))
(selection_type)
(MISSING raw_string_literal))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal)
(unset))
(select_case
(select_pattern
(default))
(default)
(interpreted_string_literal))))))
================================================================================
@ -220,20 +188,14 @@ foo = select(some_unknown_type("CONDITION"), {
(assignment
(identifier)
(operator)
(select_expression
(select_value
(condition
(ERROR
(identifier)
(interpreted_string_literal)))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(identifier)
(interpreted_string_literal)
(interpreted_string_literal)
(default))
(interpreted_string_literal))))))
(interpreted_string_literal))
(ERROR))
================================================================================
Select (multiple type arguments)
@ -252,136 +214,16 @@ foo = select(release_variable("ONE", "TWO"), {
(operator)
(select_expression
(select_value
(condition
(identifier)
(selection_type)
(ERROR
(interpreted_string_literal))
(interpreted_string_literal))
(select_cases
(select_case
(interpreted_string_literal)
(interpreted_string_literal)))
(select_cases
(select_case
(select_pattern
(interpreted_string_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(default))
(interpreted_string_literal))))))
================================================================================
Select (trailing comma in arguments)
================================================================================
foo = select(some_boolean("VALUE",), {
true: "true",
false: "false",
})
--------------------------------------------------------------------------------
(source_file
(assignment
(identifier)
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)
(ERROR)))
(select_cases
(select_case
(select_pattern
(boolean_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(boolean_literal))
(interpreted_string_literal))))))
================================================================================
Select (trailing comma in values)
================================================================================
foo = select((
arch(),
os(),
), {
(default, default): "true",
})
--------------------------------------------------------------------------------
(source_file
(assignment
(identifier)
(operator)
(select_expression
(select_value
(condition
(identifier))
(condition
(identifier)))
(select_cases
(select_case
(select_pattern
(default)
(default))
(interpreted_string_literal))))))
================================================================================
Select (trailing comma in pattern)
================================================================================
foo = select((arch(), os()), {
(default, default,): "true",
})
--------------------------------------------------------------------------------
(source_file
(assignment
(identifier)
(operator)
(select_expression
(select_value
(condition
(identifier))
(condition
(identifier)))
(select_cases
(select_case
(select_pattern
(default)
(default))
(interpreted_string_literal))))))
================================================================================
Select (boolean typed)
================================================================================
foo = select(some_boolean("IS_TRUE"), {
true: "true",
false: "false",
})
--------------------------------------------------------------------------------
(source_file
(assignment
(identifier)
(operator)
(select_expression
(select_value
(condition
(identifier)
(interpreted_string_literal)))
(select_cases
(select_case
(select_pattern
(boolean_literal))
(interpreted_string_literal))
(select_case
(select_pattern
(boolean_literal))
(interpreted_string_literal))))))
================================================================================

View file

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

View file

@ -1,9 +1,6 @@
foo = select(soong_config_variable("my_namespace", "my_var"), {
// ^ keyword.conditional
"foo": unset,
any @ foo: unset,
// ^ operator
// ^ variable
default: "bar",
})

View file

@ -26,35 +26,3 @@ foo = select(
default: 0,
}
)
foo = select((
arch(),
os(),
), {
(default, default): [],
})
foo = select(
(arch(), os()),
{
(default, default): [],
}
)
// We're really getting into more and more unlikely choices here...
foo = select(
(
arch(),
os(),
),
{
(default, default): [],
}
)
foo = select((arch(), os()), {
(
default,
default,
): [],
})

View file

@ -1,7 +1,6 @@
package.path = package.path .. ";" .. vim.env.NVIM_TREESITTER .. "/?.lua"
local Runner = require("tests.indent.common").Runner
local XFAIL = require("tests.indent.common").XFAIL
-- FIXME: path to root
local runner = Runner:new(it, ".", {
@ -20,7 +19,7 @@ describe("indent Blueprint:", function()
})
runner:whole_file("test/indent/", {
expected_failures = {
"test/indent/select.bp",
-- NOTE: none for now
},
})
end)
@ -40,22 +39,9 @@ describe("indent Blueprint:", function()
runner:new_line("test/indent/select.bp", { on_line = 1, text = 'default: "value"', indent = 4 }, "default case")
runner:new_line("test/indent/select.bp", { on_line = 11, text = '"case": "value"', indent = 4 }, "select case, trailing")
runner:new_line("test/indent/select.bp", { on_line = 11, text = 'default: "value"', indent = 4 }, "default case, trailing")
runner:new_line("test/indent/select.bp", { on_line = 11, text = '}', indent = 0 }, "select cases closing delimiter")
runner:new_line("test/indent/select.bp", { on_line = 27, text = ')', indent = 0 }, "select expression closing delimiter")
runner:new_line("test/indent/select.bp", { on_line = 16, text = '"case": "value"', indent = 8 }, "select case, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 16, text = 'default: "value"', indent = 8 }, "default case, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 26, text = '"case": "value"', indent = 8 }, "select case, trailing, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 26, text = 'default: "value"', indent = 8 }, "default case, trailing, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 26, text = '}', indent = 4 }, "select cases closing delimiter, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 27, text = ')', indent = 0 }, "select expression closing delimiter, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 30, text = 'device()', indent = 4 }, "multi-valued select condition, begin")
runner:new_line("test/indent/select.bp", { on_line = 31, text = 'device()', indent = 4 }, "multi-valued select condition, middle")
runner:new_line("test/indent/select.bp", { on_line = 32, text = 'device()', indent = 4 }, "multi-valued select condition, end")
runner:new_line("test/indent/select.bp", { on_line = 46, text = 'device()', indent = 8 }, "multi-valued select condition, begin, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 47, text = 'device()', indent = 8 }, "multi-valued select condition, middle, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 48, text = 'device()', indent = 8 }, "multi-valued select condition, end, alternate formatting")
runner:new_line("test/indent/select.bp", { on_line = 56, text = 'default,', indent = 8 }, "multi-valued select case, begin", XFAIL)
runner:new_line("test/indent/select.bp", { on_line = 57, text = 'default,', indent = 8 }, "multi-valued select case, middle", XFAIL)
runner:new_line("test/indent/select.bp", { on_line = 58, text = 'default,', indent = 8 }, "multi-valued select case, end", XFAIL)
end)
end)