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

Fix highlighting in the presence of node fields

Browse source
This commit is contained in:
Max Brunsfeld 2019-05-07 11:17:34 -07:00
parent 3fc459a84b
commit 572f290ec0
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cli/src/tests/highlight_test.rs
View file

@ -111,6 +111,7 @@ fn test_highlighting_multiline_scopes_to_html() {
" two()",
" } three",
"`",
"",
]
.join("\n");

13
lib/binding_rust/lib.rs
View file

@ -371,7 +371,10 @@ impl Parser {
pub unsafe fn set_cancellation_flag(&self, flag: Option<&AtomicUsize>) {
if let Some(flag) = flag {
ffi::ts_parser_set_cancellation_flag(self.0, flag as *const AtomicUsize as *const usize);
ffi::ts_parser_set_cancellation_flag(
self.0,
flag as *const AtomicUsize as *const usize,
);
} else {
ffi::ts_parser_set_cancellation_flag(self.0, ptr::null());
}
@ -772,11 +775,9 @@ impl<'a, P> TreePropertyCursor<'a, P> {
node_field_id: Option<u16>,
node_child_index: usize,
) -> usize {
let transitions = if let Some(field_id) = node_field_id {
state.field_transitions.get(&field_id)
} else {
state.kind_transitions.get(&node_kind_id)
};
let transitions = node_field_id
.and_then(|field_id| state.field_transitions.get(&field_id))
.or_else(|| state.kind_transitions.get(&node_kind_id));
if let Some(transitions) = transitions {
for transition in transitions.iter() {