Skip to content

fix: fix unexpected QueryError.Predicate when using multiple predicates #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 27, 2025
Merged

fix: fix unexpected QueryError.Predicate when using multiple predicates #115

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
672a82a
fix: fix unexpected QueryError.Predicate when using multiple predicates
samiaul Jun 26, 2025
23d3f6f
fix: simplify previous changes
samiaul Jun 26, 2025
d32e68f
test: add test on query with multiple predicate
samiaul Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/io/github/treesitter/jtreesitter/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ private void handlePredicates(String source, MemorySegment query, @Unsigned int
if ((steps = count.get(C_INT, 0)) == 0) continue;
int offset = ts_query_start_byte_for_pattern(query, i);
long row = source.chars().limit(offset).filter(c -> c == '\n').count();
for (long j = 0, nargs = 0; j < steps; ++j) {
for (long j = 0; j < steps;) {
long nargs = 0;
for (; ; ++nargs) {
var t = TSQueryPredicateStep.asSlice(tokens, nargs);
if (TSQueryPredicateStep.type(t) == TSQueryPredicateStepTypeDone()) break;
Expand Down Expand Up @@ -266,8 +267,8 @@ private void handlePredicates(String source, MemorySegment query, @Unsigned int
}
predicates.get(i).add(new QueryPredicate(predicate, values));
}
j += nargs;
tokens = TSQueryPredicateStep.asSlice(tokens, nargs);
j += nargs + 1;
tokens = TSQueryPredicateStep.asSlice(tokens, nargs + 1);
}
}
}
Expand Down