Compare commits

..

No commits in common. "a92c7cd5517a6a87cb646b530623ded8ee190e0a" and "6b2ecc78ac57b4283c0bd746b7cc497f56c7a2b9" have entirely different histories.

5 changed files with 3 additions and 54 deletions

View file

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

View file

@ -1,6 +1,6 @@
{ {
"name": "tree-sitter-bp", "name": "tree-sitter-bp",
"version": "0.4.0", "version": "0.3.0",
"description": "Blueprint grammar for tree-sitter", "description": "Blueprint grammar for tree-sitter",
"main": "bindings/node", "main": "bindings/node",
"types": "bindings/node", "types": "bindings/node",

View file

@ -11,15 +11,6 @@
(select_expression (select_expression
")" @indent.branch) ")" @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.begin
(select_cases (select_cases
"}" @indent.branch) "}" @indent.branch)

View file

@ -26,35 +26,3 @@ foo = select(
default: 0, 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" package.path = package.path .. ";" .. vim.env.NVIM_TREESITTER .. "/?.lua"
local Runner = require("tests.indent.common").Runner local Runner = require("tests.indent.common").Runner
local XFAIL = require("tests.indent.common").XFAIL
-- FIXME: path to root -- FIXME: path to root
local runner = Runner:new(it, ".", { local runner = Runner:new(it, ".", {
@ -20,7 +19,7 @@ describe("indent Blueprint:", function()
}) })
runner:whole_file("test/indent/", { runner:whole_file("test/indent/", {
expected_failures = { expected_failures = {
"test/indent/select.bp", -- NOTE: none for now
}, },
}) })
end) end)
@ -48,14 +47,5 @@ describe("indent Blueprint:", function()
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 = '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 = 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 = 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", XFAIL)
runner:new_line("test/indent/select.bp", { on_line = 47, text = 'device()', indent = 8 }, "multi-valued select condition, middle, alternate formatting", XFAIL)
runner:new_line("test/indent/select.bp", { on_line = 48, text = 'device()', indent = 8 }, "multi-valued select condition, end, alternate formatting", XFAIL)
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)
end) end)