traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into changed-ranges

Browse source
This commit is contained in:
Max Brunsfeld 2016-10-16 21:10:25 -07:00
commit eed54d95e1
28 changed files with 218 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/runtime/document_spec.cc
View file

@ -161,7 +161,7 @@ describe("Document", [&]() {
});
});
describe("set_logger(TSDebugger)", [&]() {
describe("set_logger(TSLogger)", [&]() {
SpyLogger *logger;
before_each([&]() {

1
spec/runtime/parser_spec.cc
View file

@ -125,7 +125,6 @@ describe("Parser", [&]() {
"(array (number) (ERROR (UNEXPECTED 'a')) (true))");
TSNode error = ts_node_named_child(root, 1);
AssertThat(ts_node_symbol(error), Equals(ts_builtin_sym_error));
AssertThat(ts_node_type(error, doc), Equals("ERROR"));
AssertThat(ts_node_child_count(error), Equals<size_t>(2));

4
spec/runtime/stack_spec.cc
View file

@ -248,7 +248,7 @@ describe("Stack", [&]() {
it("stops popping entries early if it reaches an error tree", [&]() {
// . <──0── A <──1── B <──2── C <──3── ERROR <──4── D*
ts_stack_push(stack, 0, trees[3], false, TS_STATE_ERROR);
ts_stack_push(stack, 0, trees[3], false, ERROR_STATE);
ts_stack_push(stack, 0, trees[4], false, stateD);
// . <──0── A <──1── B <──2── C <──3── ERROR <──4── D*
@ -258,7 +258,7 @@ describe("Stack", [&]() {
AssertThat(pop.status, Equals(StackPopResult::StackPopStoppedAtError));
AssertThat(ts_stack_version_count(stack), Equals<size_t>(2));
AssertThat(ts_stack_top_state(stack, 1), Equals(TS_STATE_ERROR));
AssertThat(ts_stack_top_state(stack, 1), Equals(ERROR_STATE));
AssertThat(pop.slices.size, Equals<size_t>(1));
StackSlice slice = pop.slices.contents[0];

75
spec/runtime/tree_spec.cc
View file

@ -183,14 +183,13 @@ describe("Tree", []() {
describe("edits within a tree's padding", [&]() {
it("resizes the padding of the tree and its leftmost descendants", [&]() {
TSInputEdit edit = {
.start_byte = 1,
.bytes_removed = 0,
.bytes_added = 1,
.start_point = {0, 1},
.extent_removed = {0, 0},
.extent_added = {0, 1},
};
TSInputEdit edit;
edit.start_byte = 1;
edit.bytes_removed = 0;
edit.bytes_added = 1;
edit.start_point = {0, 1};
edit.extent_removed = {0, 0};
edit.extent_added = {0, 1};
ts_tree_edit(tree, &edit);
assert_consistent(tree);
@ -210,14 +209,13 @@ describe("Tree", []() {
describe("edits that start in a tree's padding but extend into its content", [&]() {
it("shrinks the content to compensate for the expanded padding", [&]() {
TSInputEdit edit = {
.start_byte = 1,
.bytes_removed = 3,
.bytes_added = 4,
.start_point = {0, 1},
.extent_removed = {0, 3},
.extent_added = {0, 4},
};
TSInputEdit edit;
edit.start_byte = 1;
edit.bytes_removed = 3;
edit.bytes_added = 4;
edit.start_point = {0, 1};
edit.extent_removed = {0, 3};
edit.extent_added = {0, 4};
ts_tree_edit(tree, &edit);
assert_consistent(tree);
@ -233,14 +231,13 @@ describe("Tree", []() {
describe("insertions at the edge of a tree's padding", [&]() {
it("expands the tree's padding", [&]() {
TSInputEdit edit = {
.start_byte = 2,
.bytes_removed = 0,
.bytes_added = 2,
.start_point = {0, 2},
.extent_removed = {0, 0},
.extent_added = {0, 2},
};
TSInputEdit edit;
edit.start_byte = 2;
edit.bytes_removed = 0;
edit.bytes_added = 2;
edit.start_point = {0, 2};
edit.extent_removed = {0, 0};
edit.extent_added = {0, 2};
ts_tree_edit(tree, &edit);
assert_consistent(tree);
@ -260,14 +257,13 @@ describe("Tree", []() {
describe("replacements starting at the edge of a tree's padding", [&]() {
it("resizes the content and not the padding", [&]() {
TSInputEdit edit = {
.start_byte = 2,
.bytes_removed = 2,
.bytes_added = 5,
.start_point = {0, 2},
.extent_removed = {0, 2},
.extent_added = {0, 5},
};
TSInputEdit edit;
edit.start_byte = 2;
edit.bytes_removed = 2;
edit.bytes_added = 5;
edit.start_point = {0, 2};
edit.extent_removed = {0, 2};
edit.extent_added = {0, 5};
ts_tree_edit(tree, &edit);
assert_consistent(tree);
@ -285,14 +281,13 @@ describe("Tree", []() {
describe("deletions that span more than one child node", [&]() {
it("shrinks subsequent child nodes", [&]() {
TSInputEdit edit = {
.start_byte = 1,
.bytes_removed = 10,
.bytes_added = 3,
.start_point = {0, 1},
.extent_removed = {0, 10},
.extent_added = {0, 3},
};
TSInputEdit edit;
edit.start_byte = 1;
edit.bytes_removed = 10;
edit.bytes_added = 3;
edit.start_point = {0, 1};
edit.extent_removed = {0, 10};
edit.extent_added = {0, 3};
ts_tree_edit(tree, &edit);
assert_consistent(tree);