diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs index 955ae3ead8a..41232cf250f 100644 --- a/crates/language/src/syntax_map.rs +++ b/crates/language/src/syntax_map.rs @@ -2274,6 +2274,7 @@ impl Drop for QueryCursorHandle { cursor.set_point_range(Point::zero().to_ts_point()..Point::MAX.to_ts_point()); cursor.set_containing_byte_range(0..usize::MAX); cursor.set_containing_point_range(Point::zero().to_ts_point()..Point::MAX.to_ts_point()); + cursor.set_max_start_depth(None); QUERY_CURSORS.lock().push(cursor) } } diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs index d0518b71bb2..d51682c7b7d 100644 --- a/crates/language/src/syntax_map/syntax_map_tests.rs +++ b/crates/language/src/syntax_map/syntax_map_tests.rs @@ -1385,6 +1385,34 @@ fn test_injection_grouped_by_host(cx: &mut App) { } } +#[gpui::test] +fn test_max_start_depth_does_not_carry_over_to_later_queries(cx: &mut App) { + fn highlights_query(grammar: &Grammar) -> Option<&Query> { + grammar + .highlights_config + .as_ref() + .map(|config| &config.query) + } + + let (buffer, syntax_map) = test_edit_sequence("Rust", &["fn a() { b(c); }"], cx); + let capture_count = || { + syntax_map + .captures(0..buffer.len(), &buffer, highlights_query) + .count() + }; + + let expected_capture_count = capture_count(); + assert!(expected_capture_count > 0); + + drop(syntax_map.matches_with_options( + 0..buffer.len(), + &buffer, + TreeSitterOptions::max_start_depth(1), + highlights_query, + )); + assert_eq!(capture_count(), expected_capture_count); +} + #[gpui::test] fn test_syntax_map_languages_loading_with_erb(cx: &mut App) { let text = r#"