Split out oak_index_vec/ crate

Author: DavisVaughan

Cargo.lock

@@ -75,6 +75,7 @@ oak_core = { path = "crates/oak_core" }
 oak_fs = { path = "crates/oak_fs" }
 oak_ide = { path = "crates/oak_ide" }
 oak_index = { path = "crates/oak_index" }
+oak_index_vec = { path = "crates/oak_index_vec" }
 oak_package = { path = "crates/oak_package" }
 oak_r_process = { path = "crates/oak_r_process" }
 oak_sources = { path = "crates/oak_sources" }

Cargo.toml

@@ -20,6 +20,7 @@ itertools.workspace = true
 log.workspace = true
 oak_core.workspace = true
 oak_package.workspace = true
+oak_index_vec.workspace = true
 rustc-hash.workspace = true
 smallvec.workspace = true
 stdext.workspace = true

crates/oak_index/Cargo.toml

@@ -18,11 +18,11 @@ use biome_rowan::TextRange;
 use biome_rowan::WalkEvent;
 use oak_core::syntax_ext::RIdentifierExt;
 use oak_core::syntax_ext::RStringValueExt;
+use oak_index_vec::Idx;
+use oak_index_vec::IndexVec;
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
 
-use crate::index_vec::Idx;
-use crate::index_vec::IndexVec;
 use crate::semantic_index::Definition;
 use crate::semantic_index::DefinitionId;
 use crate::semantic_index::DefinitionKind;

crates/oak_index/src/builder.rs

@@ -1,7 +1,5 @@
 pub mod builder;
 pub mod external;
-pub(crate) mod index_vec;
-pub(crate) mod range;
 pub mod semantic_index;
 pub mod use_def_map;
 

crates/oak_index/src/lib.rs

@@ -4,10 +4,10 @@ use aether_syntax::RSyntaxNode;
 use biome_rowan::TextRange;
 use biome_rowan::TextSize;
 use oak_core::range::Ranged;
+use oak_index_vec::define_index;
+use oak_index_vec::IndexVec;
 use rustc_hash::FxHashMap;
 
-use crate::index_vec::define_index;
-use crate::index_vec::IndexVec;
 use crate::use_def_map::Bindings;
 use crate::use_def_map::UseDefMap;
 

crates/oak_index/src/range.rs

@@ -1,10 +1,10 @@
 use itertools::EitherOrBoth;
 use itertools::Itertools;
+use oak_index_vec::Idx;
+use oak_index_vec::IndexVec;
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
 
-use crate::index_vec::Idx;
-use crate::index_vec::IndexVec;
 use crate::semantic_index::DefinitionId;
 use crate::semantic_index::EnclosingSnapshotId;
 use crate::semantic_index::SymbolId;

crates/oak_index/src/semantic_index.rs

@@ -0,0 +1,18 @@
+[package]
+name = "oak_index_vec"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+description = """
+`Vec<V>` indexed by a strongly-typed newtype so that indices from different
+vectors can't be mixed up.
+"""
+license.workspace = true
+
+[dependencies]
+biome_text_size.workspace = true
+oak_core.workspace = true
+
+[lints]
+workspace = true

crates/oak_index/src/use_def_map.rs

@@ -46,6 +46,14 @@ impl<I: Idx, V> IndexVec<I, V> {
     }
 }
 
+impl<I: Idx, V: oak_core::range::Ranged> IndexVec<I, V> {
+    /// Find the `V` containing `offset`, if any.
+    pub fn contains(&self, offset: biome_text_size::TextSize) -> Option<(I, &V)> {
+        self.iter()
+            .find(|(_index, value)| value.range().contains(offset))
+    }
+}
+
 impl<I: Idx, V> IntoIterator for IndexVec<I, V> {
     type Item = V;
     type IntoIter = std::vec::IntoIter<V>;
@@ -90,6 +98,7 @@ impl<I: Idx, V> ops::IndexMut<I> for IndexVec<I, V> {
     }
 }
 
+#[macro_export]
 macro_rules! define_index {
     ($name:ident) => {
         #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -105,7 +114,7 @@ macro_rules! define_index {
             }
         }
 
-        impl $crate::index_vec::Idx for $name {
+        impl $crate::Idx for $name {
             fn new(value: usize) -> Self {
                 assert!(value <= Self::MAX);
                 Self(value as u32)
@@ -117,5 +126,3 @@ macro_rules! define_index {
         }
     };
 }
-
-pub(crate) use define_index;