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

Fix ts_node_string behavior for anonymous leaf nodes

Browse source 
Refs tree-sitter/py-tree-sitter#8
This commit is contained in:
Max Brunsfeld 2019-07-18 12:39:12 -07:00
parent f505613af3
commit ea515b6967
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/src/tests/node_test.rs
View file

@ -419,6 +419,23 @@ fn test_node_is_extra() {
assert!(comment_node.is_extra());
}
#[test]
fn test_node_sexp() {
let mut parser = Parser::new();
parser.set_language(get_language("javascript")).unwrap();
let tree = parser.parse("if (a) b", None).unwrap();
let root_node = tree.root_node();
let if_node = root_node.descendant_for_byte_range(0, 0).unwrap();
let paren_node = root_node.descendant_for_byte_range(3, 3).unwrap();
let identifier_node = root_node.descendant_for_byte_range(4, 4).unwrap();
assert_eq!(if_node.kind(), "if");
assert_eq!(if_node.to_sexp(), "(\"if\")");
assert_eq!(paren_node.kind(), "(");
assert_eq!(paren_node.to_sexp(), "(\"(\")");
assert_eq!(identifier_node.kind(), "identifier");
assert_eq!(identifier_node.to_sexp(), "(identifier)");
}
#[test]
fn test_node_field_names() {
let (parser_name, parser_code) = generate_parser_for_grammar(

16
lib/src/subtree.c
View file

@ -816,16 +816,16 @@ static size_t ts_subtree__write_to_string(
char *cursor = string;
char **writer = (limit > 0) ? &cursor : &string;
bool visible =
bool is_root = field_name == ROOT_FIELD;
bool is_visible =
include_all ||
alias_is_named ||
ts_subtree_missing(self) ||
(ts_subtree_visible(self) && ts_subtree_named(self));
if (visible) {
if (field_name != ROOT_FIELD) {
if (is_visible) {
if (!is_root) {
cursor += snprintf(*writer, limit, " ");
if (field_name) {
cursor += snprintf(*writer, limit, "%s: ", field_name);
}
@ -848,6 +848,10 @@ static size_t ts_subtree__write_to_string(
cursor += snprintf(*writer, limit, "(%s", symbol_name);
}
}
} else if (is_root) {
TSSymbol symbol = ts_subtree_symbol(self);
const char *symbol_name = ts_language_symbol_name(language, symbol);
cursor += snprintf(*writer, limit, "(\"%s\")", symbol_name);
}
if (ts_subtree_child_count(self)) {
@ -877,7 +881,7 @@ static size_t ts_subtree__write_to_string(
? ts_language_symbol_metadata(language, alias_symbol).named
: false;
const char *child_field_name = visible ? NULL : field_name;
const char *child_field_name = is_visible ? NULL : field_name;
for (const TSFieldMapEntry *i = field_map; i < field_map_end; i++) {
if (!i->inherited && i->child_index == structural_child_index) {
child_field_name = language->field_names[i->field_id];
@ -895,7 +899,7 @@ static size_t ts_subtree__write_to_string(
}
}
if (visible) cursor += snprintf(*writer, limit, ")");
if (is_visible) cursor += snprintf(*writer, limit, ")");
return cursor - string;
}