Skip to content

Commit 297e2bc

Browse files
committed
static query analysis: Fix handling of fields in hidden nodes
1 parent 9185262 commit 297e2bc

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

‎cli/src/tests/query_test.rs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,15 +1419,15 @@ fn test_query_matches_with_supertypes() {
14191419
let query = Query::new(
14201420
language,
14211421
r#"
1422-
(argument_list (_expression) @arg)
1422+
(argument_list (expression) @arg)
14231423
14241424
(keyword_argument
1425-
value: (_expression) @kw_arg)
1425+
value: (expression) @kw_arg)
14261426
14271427
(assignment
14281428
left: (left_hand_side (identifier) @var_def))
14291429
1430-
(_primary_expression/identifier) @var_ref
1430+
(primary_expression/identifier) @var_ref
14311431
"#,
14321432
)
14331433
.unwrap();
@@ -2704,6 +2704,14 @@ fn test_query_step_is_definite() {
27042704
("\"}\"", false),
27052705
],
27062706
},
2707+
Row {
2708+
description: "hidden nodes that have several fields",
2709+
language: get_language("java"),
2710+
pattern: r#"
2711+
(method_declaration name: (identifier))
2712+
"#,
2713+
results_by_substring: &[("name:", true)],
2714+
},
27072715
];
27082716

27092717
allocations::record(|| {

‎lib/src/query.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ static bool ts_query__analyze_patterns(TSQuery *self, unsigned *error_offset) {
11161116
const TSFieldMapEntry *field_map, *field_map_end;
11171117
ts_language_field_map(self->language, node->production_id, &field_map, &field_map_end);
11181118
for (; field_map != field_map_end; field_map++) {
1119-
if (field_map->child_index == child_index) {
1119+
if (!field_map->inherited && field_map->child_index == child_index) {
11201120
field_id = field_map->field_id;
11211121
break;
11221122
}

‎script/fetch-fixtures‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ fetch_grammar cpp master
2727
fetch_grammar embedded-template master
2828
fetch_grammar go master
2929
fetch_grammar html master
30+
fetch_grammar java master
3031
fetch_grammar javascript master
3132
fetch_grammar jsdoc master
3233
fetch_grammar json master

‎script/fetch-fixtures.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ call:fetch_grammar cpp master
66
call:fetch_grammar embedded-template master
77
call:fetch_grammar go master
88
call:fetch_grammar html master
9+
call:fetch_grammar java master
910
call:fetch_grammar javascript master
1011
call:fetch_grammar jsdoc master
1112
call:fetch_grammar json master

0 commit comments

Comments
 (0)