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

Account for supertypes during query analysis

Browse source
This commit is contained in:
Max Brunsfeld 2020-09-23 10:55:31 -07:00
parent 5003064da7
commit 21c3bbc4b4
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cli/src/tests/query_test.rs
View file

@ -291,6 +291,24 @@ fn test_query_errors_on_impossible_patterns() {
.join("\n")
))
);
Query::new(
js_lang,
"(if_statement
condition: (parenthesized_expression (_expression) @cond))",
)
.unwrap();
assert_eq!(
Query::new(js_lang, "(if_statement condition: (_expression))",),
Err(QueryError::Structure(
1,
[
"(if_statement condition: (_expression))", //
" ^",
]
.join("\n")
))
);
});
}

12
lib/src/query.c
View file

@ -639,6 +639,13 @@ static inline AnalysisStateEntry *analysis_state__top(AnalysisState *self) {
return &self->stack[self->depth - 1];
}
static inline bool analysis_state__has_supertype(AnalysisState *self, TSSymbol symbol) {
for (unsigned i = 0; i < self->depth; i++) {
if (self->stack[i].parent_symbol == symbol) return true;
}
return false;
}
/***********************
* AnalysisSubgraphNode
***********************/
@ -1134,6 +1141,9 @@ static bool ts_query__analyze_patterns(TSQuery *self, unsigned *error_offset) {
if (step->field && step->field != field_id) {
does_match = false;
}
if (step->supertype_symbol) {
if (!analysis_state__has_supertype(state, step->supertype_symbol)) does_match = false;
}
}
// If this is a hidden child, then push a new entry to the stack, in order to
@ -1673,7 +1683,7 @@ static TSQueryError ts_query__parse_pattern(
if (ts_language_symbol_metadata(self->language, symbol).supertype) {
QueryStep *step = array_back(&self->steps);
step->supertype_symbol = step->symbol;
step->symbol = WILDCARD_SYMBOL;
step->symbol = NAMED_WILDCARD_SYMBOL;
}
stream_skip_whitespace(stream);