refactor(utils): share covering text range helper

Author: hongjr03

crates/ide/src/goto_declaration.rs

@@ -1,6 +1,6 @@
 use hir::{file::HirFileId, semantics::Semantics};
 use itertools::Itertools;
-use utils::line_index::TextRange;
+use utils::line_index::covering_range;
 
 use crate::{
     FilePosition, RangeInfo,
@@ -86,9 +86,3 @@ fn render_source_declaration_target(
 
     Some(RangeInfo::new(range, navs))
 }
-
-fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
-    let start = ranges.iter().map(|range| range.start()).min()?;
-    let end = ranges.iter().map(|range| range.end()).max()?;
-    Some(TextRange::new(start, end))
-}

crates/ide/src/goto_definition.rs

@@ -10,7 +10,7 @@ use syntax::{
     SyntaxTokenWithParent, TokenKind,
     token::{TokenKindExt, pair_token},
 };
-use utils::line_index::{TextRange, TextSize};
+use utils::line_index::{TextRange, TextSize, covering_range};
 use vfs::FileId;
 
 use crate::{
@@ -62,12 +62,6 @@ fn render_definition_target(
     Some(RangeInfo::new(range, navs.into_iter().unique().collect()))
 }
 
-fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
-    let start = ranges.iter().map(|range| range.start()).min()?;
-    let end = ranges.iter().map(|range| range.end()).max()?;
-    Some(TextRange::new(start, end))
-}
-
 fn render_source_definition_target(
     db: &RootDb,
     file_id: FileId,

crates/ide/src/hover.rs

@@ -10,7 +10,7 @@ use syntax::{
 };
 use utils::{
     get::GetRef,
-    line_index::{TextRange, TextSize},
+    line_index::{TextRange, TextSize, covering_range},
     uniq_vec::UniqVec,
 };
 use vfs::FileId;
@@ -92,12 +92,6 @@ fn render_hover_target(
     })
 }
 
-fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
-    let start = ranges.iter().map(|range| range.start()).min()?;
-    let end = ranges.iter().map(|range| range.end()).max()?;
-    Some(TextRange::new(start, end))
-}
-
 fn hover_for_source_target(
     sema: &Semantics<RootDb>,
     hir_file_id: HirFileId,

crates/ide/src/hover/macro_hover/expansion.rs

@@ -3,7 +3,7 @@ use hir::{
     hir_def::macro_file::{MacroFileExpansion, macro_file_expansion, macro_files_at_offset},
     preproc::{MacroReferenceDefinitions, macro_reference_definitions_at},
 };
-use utils::line_index::{TextRange, TextSize};
+use utils::line_index::{TextRange, TextSize, covering_range};
 use vfs::FileId;
 
 use super::markup::{macro_expansion_source_fact, render_macro_expansion_header};
@@ -150,9 +150,3 @@ fn common_whitespace_prefix<'a>(left: &'a str, right: &'a str) -> &'a str {
     let end = left.bytes().zip(right.bytes()).take_while(|(left, right)| left == right).count();
     &left[..end]
 }
-
-fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
-    let start = ranges.iter().map(|range| range.start()).min()?;
-    let end = ranges.iter().map(|range| range.end()).max()?;
-    Some(TextRange::new(start, end))
-}

crates/ide/src/source_targets.rs

@@ -246,11 +246,5 @@ impl<'tree> SourceTargetProviderResult<'tree> {
     }
 }
 
-fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
-    let start = ranges.iter().map(|range| range.start()).min()?;
-    let end = ranges.iter().map(|range| range.end()).max()?;
-    Some(TextRange::new(start, end))
-}
-
 #[cfg(test)]
 mod tests;

crates/ide/src/source_targets/preproc.rs

@@ -4,12 +4,12 @@ use hir::{
     hir_def::macro_file::{ExpansionSourceHit, MacroFileId, Origin, SourceEmittedTokenId},
 };
 use syntax::{SyntaxElement, SyntaxNode, SyntaxTokenWithParent, TokenKind, WalkEvent};
-use utils::line_index::{TextRange, TextSize};
+use utils::line_index::{TextRange, TextSize, covering_range};
 use vfs::FileId;
 
 use super::{
     PreprocTokenHit, SourceTarget, SourceTargetAlternatives, SourceTargetBlock,
-    SourceTargetProviderResult, SourceTargetRequestCache, SourceTargetResolution, covering_range,
+    SourceTargetProviderResult, SourceTargetRequestCache, SourceTargetResolution,
     macro_gate::source_macro_invocation_may_cover_offset, normal_syntax_source_target_at_offset,
 };
 use crate::db::root_db::RootDb;

crates/ide/src/source_targets/tests.rs

@@ -3,6 +3,7 @@ use syntax::{
     SyntaxElement, SyntaxNode, SyntaxTree, SyntaxTreeOptions, WalkEvent, preproc::TokenOrigin,
     token::TokenKindExt,
 };
+use utils::line_index::covering_range;
 
 use super::*;
 

crates/utils/src/line_index.rs

@@ -5,6 +5,12 @@ use std::ops::Range;
 use nohash_hasher::IntMap;
 pub use text_size::{TextRange, TextSize};
 
+pub fn covering_range(ranges: &[TextRange]) -> Option<TextRange> {
+    let start = ranges.iter().map(|range| range.start()).min()?;
+    let end = ranges.iter().map(|range| range.end()).max()?;
+    Some(TextRange::new(start, end))
+}
+
 /// `(line, column)` information in the native, UTF-8 encoding.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct LineCol {