Skip to content

Commit 862b89a

Browse files
pascalkuthearchseer
authored andcommitted
improve performance of tree sitter query captures (for text object motions in particular) (helix-editor#4707)
* add tree sitter match limit to avoid slowdowns for larger files Affects all tree sitter queries and should speedup both syntax highlighting and text object queries. This has been shown to fix significant slowdowns with textobjects for rust files as small as 3k loc. * Apply suggestions from code review Co-authored-by: Blaž Hrastnik <[email protected]> Co-authored-by: Blaž Hrastnik <[email protected]>
1 parent b93a1a8 commit 862b89a

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

helix-core/src/syntax.rs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,25 @@ impl<'a> CapturedNode<'a> {
354354
}
355355
}
356356

357+
/// The number of matches a TS cursor can at once to avoid performance problems for medium to large files.
358+
/// Set with `set_match_limit`.
359+
/// Using such a limit means that we lose valid captures in, so there is fundamentally a tradeoff here.
360+
///
361+
///
362+
/// Old tree sitter versions used a limit of 32 by default until this limit was removed in version `0.19.5` (must now be set manually).
363+
/// However, this causes performance issues for medium to large files.
364+
/// In helix, this problem caused treesitter motions to take multiple seconds to complete in medium-sized rust files (3k loc).
365+
/// Neovim also encountered this problem and reintroduced this limit after it was removed upstream
366+
/// (see <https://github.com/neovim/neovim/issues/14897> and <https://github.com/neovim/neovim/pull/14915>).
367+
/// The number used here is fundamentally a tradeoff between breaking some obscure edge cases and performance.
368+
///
369+
///
370+
/// A value of 64 was chosen because neovim uses that value.
371+
/// Neovim chose this value somewhat arbitrarily (<https://github.com/neovim/neovim/pull/18397>) adjusting it whenever issues occur in practice.
372+
/// However this value has been in use for a long time and due to the large userbase of neovim it is probably a good choice.
373+
/// If this limit causes problems for a grammar in the future, it could be increased.
374+
const TREE_SITTER_MATCH_LIMIT: u32 = 64;
375+
357376
impl TextObjectQuery {
358377
/// Run the query on the given node and return sub nodes which match given
359378
/// capture ("function.inside", "class.around", etc).
@@ -394,6 +413,8 @@ impl TextObjectQuery {
394413
.iter()
395414
.find_map(|cap| self.query.capture_index_for_name(cap))?;
396415

416+
cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
417+
397418
let nodes = cursor
398419
.captures(&self.query, node, RopeProvider(slice))
399420
.filter_map(move |(mat, _)| {
@@ -843,6 +864,7 @@ impl Syntax {
843864
let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
844865
// TODO: might need to set cursor range
845866
cursor.set_byte_range(0..usize::MAX);
867+
cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
846868

847869
let source_slice = source.slice(..);
848870

@@ -1032,6 +1054,7 @@ impl Syntax {
10321054

10331055
// if reusing cursors & no range this resets to whole range
10341056
cursor_ref.set_byte_range(range.clone().unwrap_or(0..usize::MAX));
1057+
cursor_ref.set_match_limit(TREE_SITTER_MATCH_LIMIT);
10351058

10361059
let mut captures = cursor_ref
10371060
.captures(

0 commit comments

Comments
 (0)