Detailed changes
@@ -3894,9 +3894,6 @@ impl BufferSnapshot {
text: item.text,
highlight_ranges: item.highlight_ranges,
name_ranges: item.name_ranges,
- signature_range: item
- .signature_range
- .map(|r| self.anchor_after(r.start)..self.anchor_before(r.end)),
body_range: item
.body_range
.map(|r| self.anchor_after(r.start)..self.anchor_before(r.end)),
@@ -3940,15 +3937,6 @@ impl BufferSnapshot {
let mut open_point = None;
let mut close_point = None;
- let mut signature_start = None;
- let mut signature_end = None;
- let mut extend_signature_range = |node: tree_sitter::Node| {
- if signature_start.is_none() {
- signature_start = Some(Point::from_ts_point(node.start_position()));
- }
- signature_end = Some(Point::from_ts_point(node.end_position()));
- };
-
let mut buffer_ranges = Vec::new();
let mut add_to_buffer_ranges = |node: tree_sitter::Node, node_is_name| {
let mut range = node.start_byte()..node.end_byte();
@@ -3965,12 +3953,10 @@ impl BufferSnapshot {
for capture in mat.captures {
if capture.index == config.name_capture_ix {
add_to_buffer_ranges(capture.node, true);
- extend_signature_range(capture.node);
} else if Some(capture.index) == config.context_capture_ix
|| (Some(capture.index) == config.extra_context_capture_ix && include_extra_context)
{
add_to_buffer_ranges(capture.node, false);
- extend_signature_range(capture.node);
} else {
if Some(capture.index) == config.open_capture_ix {
open_point = Some(Point::from_ts_point(capture.node.end_position()));
@@ -4033,17 +4019,12 @@ impl BufferSnapshot {
last_buffer_range_end = buffer_range.end;
}
- let signature_range = signature_start
- .zip(signature_end)
- .map(|(start, end)| start..end);
-
Some(OutlineItem {
depth: 0, // We'll calculate the depth later
range: item_point_range,
text,
highlight_ranges,
name_ranges,
- signature_range,
body_range: open_point.zip(close_point).map(|(start, end)| start..end),
annotation_range: None,
})
@@ -19,7 +19,6 @@ pub struct OutlineItem<T> {
pub text: String,
pub highlight_ranges: Vec<(Range<usize>, HighlightStyle)>,
pub name_ranges: Vec<Range<usize>>,
- pub signature_range: Option<Range<T>>,
pub body_range: Option<Range<T>>,
pub annotation_range: Option<Range<T>>,
}
@@ -36,10 +35,6 @@ impl<T: ToPoint> OutlineItem<T> {
text: self.text.clone(),
highlight_ranges: self.highlight_ranges.clone(),
name_ranges: self.name_ranges.clone(),
- signature_range: self
- .signature_range
- .as_ref()
- .map(|r| r.start.to_point(buffer)..r.end.to_point(buffer)),
body_range: self
.body_range
.as_ref()
@@ -213,7 +208,6 @@ mod tests {
text: "class Foo".to_string(),
highlight_ranges: vec![],
name_ranges: vec![6..9],
- signature_range: None,
body_range: None,
annotation_range: None,
},
@@ -223,7 +217,6 @@ mod tests {
text: "private".to_string(),
highlight_ranges: vec![],
name_ranges: vec![],
- signature_range: None,
body_range: None,
annotation_range: None,
},
@@ -248,7 +241,6 @@ mod tests {
text: "fn process".to_string(),
highlight_ranges: vec![],
name_ranges: vec![3..10],
- signature_range: None,
body_range: None,
annotation_range: None,
},
@@ -258,7 +250,6 @@ mod tests {
text: "struct DataProcessor".to_string(),
highlight_ranges: vec![],
name_ranges: vec![7..20],
- signature_range: None,
body_range: None,
annotation_range: None,
},
@@ -6130,12 +6130,6 @@ impl MultiBufferSnapshot {
text: item.text,
highlight_ranges: item.highlight_ranges,
name_ranges: item.name_ranges,
- signature_range: item.signature_range.and_then(|signature_range| {
- Some(
- self.anchor_in_excerpt(*excerpt_id, signature_range.start)?
- ..self.anchor_in_excerpt(*excerpt_id, signature_range.end)?,
- )
- }),
body_range: item.body_range.and_then(|body_range| {
Some(
self.anchor_in_excerpt(*excerpt_id, body_range.start)?
@@ -6176,12 +6170,6 @@ impl MultiBufferSnapshot {
text: item.text,
highlight_ranges: item.highlight_ranges,
name_ranges: item.name_ranges,
- signature_range: item.signature_range.and_then(|signature_range| {
- Some(
- self.anchor_in_excerpt(excerpt_id, signature_range.start)?
- ..self.anchor_in_excerpt(excerpt_id, signature_range.end)?,
- )
- }),
body_range: item.body_range.and_then(|body_range| {
Some(
self.anchor_in_excerpt(excerpt_id, body_range.start)?
@@ -2481,7 +2481,6 @@ impl OutlinePanel {
&OutlineItem {
depth,
annotation_range: None,
- signature_range: None,
range: search_data.context_range.clone(),
text: search_data.context_text.clone(),
highlight_ranges: search_data