Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #894 from zed-industries/typescript-outline-fixes

Browse source 
Fix missing TypeScript outline entries and breadcrumbs
This commit is contained in:
Max Brunsfeld 2022-04-22 14:21:46 -07:00 • committed by GitHub
commit d12df4224a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/language/Cargo.toml
View file

@ -57,6 +57,6 @@ util = { path = "../util", features = ["test-support"] }
ctor = "0.1"
env_logger = "0.8"
rand = "0.8.3"
tree-sitter-json = "0.19.0"
tree-sitter-rust = "0.20.0"
tree-sitter-json = "*"
tree-sitter-rust = "*"
unindent = "0.1.7"

13
crates/language/src/buffer.rs
View file

@ -1730,7 +1730,7 @@ impl BufferSnapshot {
.and_then(|language| language.grammar.as_ref())?;
let mut cursor = QueryCursorHandle::new();
cursor.set_byte_range(range);
cursor.set_byte_range(range.clone());
let matches = cursor.matches(
&grammar.outline_query,
tree.root_node(),
@ -1750,7 +1750,10 @@ impl BufferSnapshot {
let items = matches
.filter_map(|mat| {
let item_node = mat.nodes_for_capture_index(item_capture_ix).next()?;
let range = item_node.start_byte()..item_node.end_byte();
let item_range = item_node.start_byte()..item_node.end_byte();
if item_range.end < range.start || item_range.start > range.end {
return None;
}
let mut text = String::new();
let mut name_ranges = Vec::new();
let mut highlight_ranges = Vec::new();
@ -1808,15 +1811,15 @@ impl BufferSnapshot {
}
while stack.last().map_or(false, |prev_range| {
!prev_range.contains(&range.start) || !prev_range.contains(&range.end)
!prev_range.contains(&item_range.start) || !prev_range.contains(&item_range.end)
}) {
stack.pop();
}
stack.push(range.clone());
stack.push(item_range.clone());
Some(OutlineItem {
depth: stack.len() - 1,
range: self.anchor_after(range.start)..self.anchor_before(range.end),
range: self.anchor_after(item_range.start)..self.anchor_before(item_range.end),
text,
highlight_ranges,
name_ranges,