rubydex 0.2.3 → 0.2.5

data/rust/rubydex/src/test_utils/graph_test.rs

@@ -1,20 +1,34 @@
 use super::normalize_indentation;
 #[cfg(test)]
 use crate::diagnostic::Rule;
-use crate::indexing::{self, LanguageId};
+use crate::indexing::{self, IndexerBackend, LanguageId};
 use crate::model::graph::{Graph, NameDependent};
 use crate::model::ids::{NameId, StringId};
 use crate::resolution::Resolver;
 
-#[derive(Default)]
 pub struct GraphTest {
     graph: Graph,
+    backend: IndexerBackend,
+}
+
+impl Default for GraphTest {
+    fn default() -> Self {
+        Self::new()
+    }
 }
 
 impl GraphTest {
     #[must_use]
     pub fn new() -> Self {
-        Self { graph: Graph::new() }
+        Self::new_with_backend(IndexerBackend::RubyIndexer)
+    }
+
+    #[must_use]
+    pub fn new_with_backend(backend: IndexerBackend) -> Self {
+        Self {
+            graph: Graph::new(),
+            backend,
+        }
     }
 
     #[must_use]
@@ -30,7 +44,8 @@ impl GraphTest {
     /// Indexes a Ruby source
     pub fn index_uri(&mut self, uri: &str, source: &str) {
         let source = normalize_indentation(source);
-        indexing::index_source(&mut self.graph, uri, &source, &LanguageId::Ruby);
+        let local_graph = indexing::build_local_graph(uri.to_string(), &source, &LanguageId::Ruby, self.backend);
+        self.graph.consume_document_changes(local_graph);
     }
 
     /// Indexes an RBS source

data/rust/rubydex/src/test_utils/local_graph_test.rs

@@ -1,7 +1,7 @@
 use super::normalize_indentation;
 use crate::indexing::local_graph::LocalGraph;
 use crate::indexing::rbs_indexer::RBSIndexer;
-use crate::indexing::ruby_indexer::RubyIndexer;
+use crate::indexing::{IndexerBackend, LanguageId, build_local_graph};
 use crate::model::definitions::Definition;
 use crate::model::graph::NameDependent;
 use crate::model::ids::{NameId, StringId, UriId};
@@ -19,13 +19,14 @@ pub struct LocalGraphTest {
 impl LocalGraphTest {
     #[must_use]
     pub fn new(uri: &str, source: &str) -> Self {
+        Self::new_with_backend(uri, source, IndexerBackend::RubyIndexer)
+    }
+
+    #[must_use]
+    pub fn new_with_backend(uri: &str, source: &str, backend: IndexerBackend) -> Self {
         let uri = uri.to_string();
         let source = normalize_indentation(source);
-
-        let mut indexer = RubyIndexer::new(uri.clone(), &source);
-        indexer.index();
-        let graph = indexer.local_graph();
-
+        let graph = build_local_graph(uri.clone(), &source, &LanguageId::Ruby, backend);
         Self { uri, source, graph }
     }
 

data/rust/rubydex-mcp/Cargo.toml

@@ -12,7 +12,7 @@ path = "src/main.rs"
 [dependencies]
 rubydex = { path = "../rubydex" }
 clap = { version = "4.5.16", features = ["derive"] }
-rmcp = { version = "0.15", features = ["server", "macros", "transport-io", "schemars"] }
+rmcp = { version = "1.4", features = ["server", "macros", "transport-io", "schemars"] }
 tokio = { version = "1", features = ["macros", "rt", "io-std"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

data/rust/rubydex-mcp/src/server.rs

@@ -54,7 +54,11 @@ impl RubydexServer {
                 }
 
                 let mut graph = Graph::new();
-                let errors = rubydex::indexing::index_files(&mut graph, file_paths);
+                let errors = rubydex::indexing::index_files(
+                    &mut graph,
+                    file_paths,
+                    rubydex::indexing::IndexerBackend::RubyIndexer,
+                );
                 for error in &errors {
                     eprintln!("Indexing error: {error}");
                 }
@@ -565,14 +569,13 @@ Pagination: tools that may return a high number of results include `total` for p
 
 Use Grep instead for: literal string search, log messages, comments, non-Ruby files, or content search rather than structural queries."#;
 
-#[tool_handler]
+#[tool_handler(router = self.tool_router)]
 impl ServerHandler for RubydexServer {
     fn get_info(&self) -> ServerInfo {
-        ServerInfo {
-            instructions: Some(SERVER_INSTRUCTIONS.into()),
-            capabilities: ServerCapabilities::builder().enable_tools().build(),
-            ..Default::default()
-        }
+        let mut info = ServerInfo::default();
+        info.instructions = Some(SERVER_INSTRUCTIONS.into());
+        info.capabilities = ServerCapabilities::builder().enable_tools().build();
+        info
     }
 }
 

data/rust/rubydex-sys/src/definition_api.rs

@@ -276,6 +276,30 @@ pub unsafe extern "C" fn rdx_definition_declaration(pointer: GraphPointer, defin
     })
 }
 
+/// Returns the lexical nesting definition id for the given definition, or NULL if there is no lexical nesting.
+/// Caller must free the returned pointer with `free_u64`.
+///
+/// # Safety
+/// - `pointer` must be a valid pointer previously returned by `rdx_graph_new`.
+/// - `definition_id` must be a valid definition id.
+///
+/// # Panics
+/// This function will panic if the definition cannot be found.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn rdx_definition_lexical_nesting_id(pointer: GraphPointer, definition_id: u64) -> *const u64 {
+    with_graph(pointer, |graph| {
+        let def_id = DefinitionId::new(definition_id);
+        let Some(defn) = graph.definitions().get(&def_id) else {
+            panic!("Definition not found: {definition_id:?}");
+        };
+
+        match defn.lexical_nesting_id() {
+            Some(lexical_nesting_id) => Box::into_raw(Box::new(**lexical_nesting_id)).cast_const(),
+            None => ptr::null(),
+        }
+    })
+}
+
 /// Creates a new iterator over definition IDs for a given declaration by snapshotting the current set of IDs.
 ///
 /// # Panics

data/rust/rubydex-sys/src/graph_api.rs

@@ -233,7 +233,7 @@ pub unsafe extern "C" fn rdx_index_all(
 
     with_mut_graph(pointer, |graph| {
         let (file_paths, listing_errors) = listing::collect_file_paths(file_paths, graph.excluded_paths());
-        let indexing_errors = indexing::index_files(graph, file_paths);
+        let indexing_errors = indexing::index_files(graph, file_paths, indexing::IndexerBackend::RubyIndexer);
 
         let all_errors: Vec<String> = listing_errors
             .into_iter()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydex
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Shopify
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-11 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies: []
 description: A high-performance static analysis suite for Ruby, built in Rust with
   Ruby APIs
@@ -16,6 +16,7 @@ email:
 - ruby@shopify.com
 executables:
 - rdx
+- rubydex_mcp
 extensions:
 - ext/rubydex/extconf.rb
 extra_rdoc_files: []
@@ -24,6 +25,7 @@ files:
 - README.md
 - THIRD_PARTY_LICENSES.html
 - exe/rdx
+- exe/rubydex_mcp
 - ext/rubydex/declaration.c
 - ext/rubydex/declaration.h
 - ext/rubydex/definition.c
@@ -46,6 +48,7 @@ files:
 - ext/rubydex/utils.c
 - ext/rubydex/utils.h
 - lib/rubydex.rb
+- lib/rubydex/bin/rubydex_mcp.exe
 - lib/rubydex/comment.rb
 - lib/rubydex/declaration.rb
 - lib/rubydex/diagnostic.rb
@@ -114,6 +117,10 @@ files:
 - rust/rubydex/src/model/string_ref.rs
 - rust/rubydex/src/model/visibility.rs
 - rust/rubydex/src/offset.rs
+- rust/rubydex/src/operation/applier.rs
+- rust/rubydex/src/operation/mod.rs
+- rust/rubydex/src/operation/printer.rs
+- rust/rubydex/src/operation/ruby_builder.rs
 - rust/rubydex/src/position.rs
 - rust/rubydex/src/query.rs
 - rust/rubydex/src/resolution.rs