diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs index 311ef4d55b947888cd7fbc6706a9bd581f2dd27d..99eae4c2028a9bd3aa82a4facb9e2099e8b5dea4 100644 --- a/crates/language/src/buffer.rs +++ b/crates/language/src/buffer.rs @@ -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, }) diff --git a/crates/language/src/outline.rs b/crates/language/src/outline.rs index 09c556cf98f58ea26925e1df8bde9d43ec72e6c7..d96cd90e03142c6498ae17bc63e1787d99e8557a 100644 --- a/crates/language/src/outline.rs +++ b/crates/language/src/outline.rs @@ -19,7 +19,6 @@ pub struct OutlineItem { pub text: String, pub highlight_ranges: Vec<(Range, HighlightStyle)>, pub name_ranges: Vec>, - pub signature_range: Option>, pub body_range: Option>, pub annotation_range: Option>, } @@ -36,10 +35,6 @@ impl OutlineItem { 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, }, diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs index 8d72e919a4802c1875c956fc3e6d72fc0e9a2ade..8dd75a4c8b02c5e09f9c8df4221944755c4ed672 100644 --- a/crates/multi_buffer/src/multi_buffer.rs +++ b/crates/multi_buffer/src/multi_buffer.rs @@ -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)? diff --git a/crates/outline_panel/src/outline_panel.rs b/crates/outline_panel/src/outline_panel.rs index 5fd3103dff842bfbacc612536218ac7367b27ec4..863725ad851d5b2e2e44895d97d59fdb2f062f1a 100644 --- a/crates/outline_panel/src/outline_panel.rs +++ b/crates/outline_panel/src/outline_panel.rs @@ -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