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

Merge pull request #1075 from tree-sitter/wasm-match-limit

Browse source 
binding_web: Add Query.didExceedMatchLimit
This commit is contained in:
Douglas Creager 2021-04-28 16:24:06 -04:00 • committed by GitHub
commit 4e321f34a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/binding_web/binding.c
View file

@ -622,8 +622,11 @@ void ts_query_matches_wasm(
}
}
bool did_exceed_match_limit =
ts_query_cursor_did_exceed_match_limit(scratch_query_cursor);
TRANSFER_BUFFER[0] = (const void *)(match_count);
TRANSFER_BUFFER[1] = result.contents;
TRANSFER_BUFFER[2] = (const void *)(did_exceed_match_limit);
}
void ts_query_captures_wasm(
@ -667,6 +670,9 @@ void ts_query_captures_wasm(
}
}
bool did_exceed_match_limit =
ts_query_cursor_did_exceed_match_limit(scratch_query_cursor);
TRANSFER_BUFFER[0] = (const void *)(capture_count);
TRANSFER_BUFFER[1] = result.contents;
TRANSFER_BUFFER[2] = (const void *)(did_exceed_match_limit);
}

9
lib/binding_web/binding.js
View file

@ -945,6 +945,7 @@ class Query {
this.setProperties = setProperties;
this.assertedProperties = assertedProperties;
this.refutedProperties = refutedProperties;
this.exceededMatchLimit = false;
}
delete() {
@ -969,7 +970,9 @@ class Query {
const rawCount = getValue(TRANSFER_BUFFER, 'i32');
const startAddress = getValue(TRANSFER_BUFFER + SIZE_OF_INT, 'i32');
const didExceedMatchLimit = getValue(TRANSFER_BUFFER + 2 * SIZE_OF_INT, 'i32');
const result = new Array(rawCount);
this.exceededMatchLimit = !!didExceedMatchLimit;
let filteredCount = 0;
let address = startAddress;
@ -1014,7 +1017,9 @@ class Query {
const count = getValue(TRANSFER_BUFFER, 'i32');
const startAddress = getValue(TRANSFER_BUFFER + SIZE_OF_INT, 'i32');
const didExceedMatchLimit = getValue(TRANSFER_BUFFER + 2 * SIZE_OF_INT, 'i32');
const result = [];
this.exceededMatchLimit = !!didExceedMatchLimit;
const captures = [];
let address = startAddress;
@ -1048,6 +1053,10 @@ class Query {
predicatesForPattern(patternIndex) {
return this.predicates[patternIndex]
}
didExceedMatchLimit() {
return this.exceededMatchLimit;
}
}
function getText(tree, startIndex, endIndex) {

20
lib/binding_web/test/query-test.js
View file

@ -238,6 +238,26 @@ describe("Query", () => {
refutedProperties: { bar: "baz" },
},
]);
assert.ok(!query.didExceedMatchLimit());
});
it("detects queries with too many permutations to track", () => {
tree = parser.parse(`
[
hello, hello, hello, hello, hello, hello, hello, hello, hello, hello,
hello, hello, hello, hello, hello, hello, hello, hello, hello, hello,
hello, hello, hello, hello, hello, hello, hello, hello, hello, hello,
hello, hello, hello, hello, hello, hello, hello, hello, hello, hello,
hello, hello, hello, hello, hello, hello, hello, hello, hello, hello,
];
`);
query = JavaScript.query(`
(array (identifier) @pre (identifier) @post)
`);
const captures = query.captures(tree.rootNode);
assert.ok(query.didExceedMatchLimit());
});
});