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

Preserve tokens within errors

Browse source
This commit is contained in:
Max Brunsfeld 2015-06-15 15:24:15 -07:00
parent 0c4620f3ab
commit 3d0890eecf
9 changed files with 89 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

39
spec/runtime/parser_spec.cc
View file

@ -76,13 +76,13 @@ describe("Parser", [&]() {
set_text(" [123, @@@@@, true]");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (array (number) (ERROR '@') (true)))"));
"(DOCUMENT (array (number) (ERROR (UNEXPECTED '@')) (true)))"));
TSNode *array = ts_node_child(root, 0);
TSNode *error = ts_node_child(array, 1);
TSNode *last = ts_node_child(array, 2);
AssertThat(ts_node_name(error), Equals("error"));
AssertThat(ts_node_name(error), Equals("ERROR"));
AssertThat(ts_node_pos(error).bytes, Equals(strlen(" [123, ")))
AssertThat(ts_node_size(error).bytes, Equals(strlen("@@@@@")))
@ -100,13 +100,13 @@ describe("Parser", [&]() {
set_text(" [123, faaaaalse, true]");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (array (number) (ERROR 'a') (true)))"));
"(DOCUMENT (array (number) (ERROR (UNEXPECTED 'a')) (true)))"));
TSNode *array = ts_node_child(root, 0);
TSNode *error = ts_node_child(array, 1);
TSNode *last = ts_node_child(array, 2);
AssertThat(ts_node_name(error), Equals("error"));
AssertThat(ts_node_name(error), Equals("ERROR"));
AssertThat(ts_node_pos(error).bytes, Equals(strlen(" [123, ")))
AssertThat(ts_node_size(error).bytes, Equals(strlen("faaaaalse")))
@ -124,13 +124,13 @@ describe("Parser", [&]() {
set_text(" [123, true false, true]");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (array (number) (ERROR 'f') (true)))"));
"(DOCUMENT (array (number) (ERROR (true) (UNEXPECTED 'f') (false)) (true)))"));
TSNode *array = ts_node_child(root, 0);
TSNode *error = ts_node_child(array, 1);
TSNode *last = ts_node_child(array, 2);
AssertThat(ts_node_name(error), Equals("error"));
AssertThat(ts_node_name(error), Equals("ERROR"));
AssertThat(ts_node_pos(error).bytes, Equals(strlen(" [123, ")));
AssertThat(ts_node_size(error).bytes, Equals(strlen("true false")));
@ -148,13 +148,13 @@ describe("Parser", [&]() {
set_text(" [123, , true]");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (array (number) (ERROR ',') (true)))"));
"(DOCUMENT (array (number) (ERROR (UNEXPECTED ',')) (true)))"));
TSNode *array = ts_node_child(root, 0);
TSNode *error = ts_node_child(array, 1);
TSNode *last = ts_node_child(array, 2);
AssertThat(ts_node_name(error), Equals("error"));
AssertThat(ts_node_name(error), Equals("ERROR"));
AssertThat(ts_node_pos(error).bytes, Equals(strlen(" [123, ")));
AssertThat(ts_node_size(error).bytes, Equals<size_t>(0))
@ -286,7 +286,7 @@ describe("Parser", [&]() {
insert_text(strlen("var x = y"), " *");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (var_declaration (ERROR ';')))"));
"(DOCUMENT (var_declaration (ERROR (identifier) (identifier) (UNEXPECTED ';'))))"));
insert_text(strlen("var x = y *"), " z");
@ -296,25 +296,6 @@ describe("Parser", [&]() {
});
});
describe("fixing an error", [&]() {
it("doesn't try to reuse the error node", [&]() {
ts_document_set_language(doc, ts_language_javascript());
set_text(
"var y = z\n"
"var x = y;");
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (program "
"(var_declaration (var_assignment (identifier) (identifier))) "
"(var_declaration (var_assignment (identifier) (identifier)))))"));
delete_text(strlen("var y = "), 1);
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (var_declaration (ERROR 'x')))"));
});
});
describe("into the middle of an existing token", [&]() {
before_each([&]() {
set_text("abc * 123");
@ -411,7 +392,7 @@ describe("Parser", [&]() {
it("updates the parse tree, creating an error", [&]() {
AssertThat(ts_node_string(root), Equals(
"(DOCUMENT (number) (ERROR '4'))"));
"(DOCUMENT (number) (ERROR (UNEXPECTED '4') (number)))"));
});
});
});