Make index_source language_id optional

Author: st0012

ext/rubydex/graph.c

@@ -85,19 +85,28 @@ static VALUE rdxr_graph_index_all(VALUE self, VALUE file_paths) {
     return array;
 }
 
-// Indexes a single source string in memory, dispatching to the appropriate indexer based on language_id
+// Indexes a single source string in memory, dispatching to the appropriate indexer based on language_id.
 //
-// Graph#index_source: (String uri, String source, String language_id) -> void
-static VALUE rdxr_graph_index_source(VALUE self, VALUE uri, VALUE source, VALUE language_id) {
+// Graph#index_source: (String uri, String source, ?String language_id) -> void
+static VALUE rdxr_graph_index_source(int argc, VALUE *argv, VALUE self) {
+    VALUE uri, source, language_id;
+    rb_scan_args(argc, argv, "21", &uri, &source, &language_id);
+
     Check_Type(uri, T_STRING);
     Check_Type(source, T_STRING);
-    Check_Type(language_id, T_STRING);
 
     void *graph;
     TypedData_Get_Struct(self, void *, &graph_type, graph);
 
     const char *uri_str = StringValueCStr(uri);
-    const char *language_id_str = StringValueCStr(language_id);
+    const char *language_id_str = NULL;
+    if (NIL_P(language_id)) {
+        language_id_str = NULL;
+    } else {
+        Check_Type(language_id, T_STRING);
+        language_id_str = StringValueCStr(language_id);
+    }
+
     const char *source_str = RSTRING_PTR(source);
     size_t source_len = RSTRING_LEN(source);
 
@@ -746,7 +755,7 @@ void rdxi_initialize_graph(VALUE moduleRubydex) {
 
     rb_define_alloc_func(cGraph, rdxr_graph_alloc);
     rb_define_method(cGraph, "index_all", rdxr_graph_index_all, 1);
-    rb_define_method(cGraph, "index_source", rdxr_graph_index_source, 3);
+    rb_define_method(cGraph, "index_source", rdxr_graph_index_source, -1);
     rb_define_method(cGraph, "document", rdxr_graph_document, 1);
     rb_define_method(cGraph, "delete_document", rdxr_graph_delete_document, 1);
     rb_define_method(cGraph, "resolve", rdxr_graph_resolve, 0);

rbi/rubydex.rbi

@@ -298,8 +298,8 @@ class Rubydex::Graph
   sig { params(file_paths: T::Array[String]).returns(T::Array[String]) }
   def index_all(file_paths); end
 
-  sig { params(uri: String, source: String, language_id: String).void }
-  def index_source(uri, source, language_id); end
+  sig { params(uri: String, source: String, language_id: T.nilable(String)).void }
+  def index_source(uri, source, language_id = nil); end
 
   # Index all files and dependencies of the workspace that exists in `@workspace_path`
   sig { returns(T::Array[String]) }

rust/rubydex-sys/src/graph_api.rs

@@ -18,7 +18,7 @@ use rubydex::query::{CompletionCandidate, CompletionContext, CompletionReceiver}
 use rubydex::resolution::Resolver;
 use rubydex::{indexing, integrity, listing, query};
 use std::ffi::CString;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::{mem, ptr};
 
 pub type GraphPointer = *mut c_void;
@@ -562,13 +562,20 @@ pub enum IndexSourceResult {
     UnsupportedLanguageId = 4,
 }
 
-/// Indexes source code from memory using the specified language.  Returns `IndexSourceResult::Success` on success
-/// or a specific error variant if string conversion or language lookup fails.
+fn language_from_uri(uri: &str) -> LanguageId {
+    let extension = Path::new(uri).extension();
+    extension.map_or(LanguageId::Ruby, LanguageId::from)
+}
+
+/// Indexes source code from memory using the specified language. If `language_id` is null, infers the language from
+/// the URI using the same default as file indexing. Returns `IndexSourceResult::Success` on success or a specific error
+/// variant if string conversion or language lookup fails.
 ///
 /// # Safety
 ///
 /// - `pointer` must be a valid `GraphPointer` previously returned by this crate.
-/// - `uri` and `language_id` must be valid, null-terminated UTF-8 strings.
+/// - `uri` must be a valid, null-terminated UTF-8 string.
+/// - `language_id` must be either null or a valid, null-terminated UTF-8 string.
 /// - `source` must point to a valid UTF-8 byte buffer of at least `source_len` bytes.
 ///   It may contain null bytes.
 #[unsafe(no_mangle)]
@@ -588,12 +595,18 @@ pub unsafe extern "C" fn rdx_index_source(
         return IndexSourceResult::InvalidSource;
     };
 
-    let Ok(language_id_str) = (unsafe { utils::convert_char_ptr_to_string(language_id) }) else {
-        return IndexSourceResult::InvalidLanguageId;
-    };
+    let language = if language_id.is_null() {
+        language_from_uri(&uri_str)
+    } else {
+        let Ok(language_id_str) = (unsafe { utils::convert_char_ptr_to_string(language_id) }) else {
+            return IndexSourceResult::InvalidLanguageId;
+        };
+
+        let Ok(language) = LanguageId::from_language_id(&language_id_str) else {
+            return IndexSourceResult::UnsupportedLanguageId;
+        };
 
-    let Ok(language) = LanguageId::from_language_id(&language_id_str) else {
-        return IndexSourceResult::UnsupportedLanguageId;
+        language
     };
 
     with_mut_graph(pointer, |graph| {

test/graph_test.rb

@@ -529,18 +529,80 @@ def test_delete_uri_with_invalid_argument
 
   def test_index_source_with_ruby
     graph = Rubydex::Graph.new
-    graph.index_source("file:///foo.rb", "class Foo; end", "ruby")
+    graph.index_source("file:///foo.rb", <<~RUBY, "ruby")
+      class Foo
+        def bar; end
+      end
+    RUBY
     graph.resolve
 
-    assert_equal(2, graph.documents.count)
-    refute_nil(graph["Foo"])
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
+  end
+
+  def test_index_source_infers_ruby_language_id_when_omitted
+    graph = Rubydex::Graph.new
+    graph.index_source("file:///foo.rake", <<~RUBY)
+      class Foo
+        def bar; end
+      end
+    RUBY
+    graph.resolve
+
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
+  end
+
+  def test_index_source_infers_ruby_language_id_when_nil
+    graph = Rubydex::Graph.new
+    graph.index_source("untitled:Untitled-1", <<~RUBY, nil)
+      class Foo
+        def bar; end
+      end
+    RUBY
+    graph.resolve
+
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
   end
 
   def test_index_source_with_rbs
     graph = Rubydex::Graph.new
-    graph.index_source("file:///foo.rbs", "class Foo\nend", "rbs")
+    graph.index_source("file:///foo.rbs", <<~RBS, "rbs")
+      class Foo
+        def bar: () -> void
+      end
+    RBS
+    graph.resolve
 
-    assert_equal(2, graph.documents.count)
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
+  end
+
+  def test_index_source_keeps_explicit_rbs_language_id_override
+    graph = Rubydex::Graph.new
+    graph.index_source("file:///foo.rb", <<~RBS, "rbs")
+      class Foo
+        def bar: () -> void
+      end
+    RBS
+    graph.resolve
+
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
+  end
+
+  def test_index_source_infers_rbs_language_id_when_omitted
+    graph = Rubydex::Graph.new
+    graph.index_source("file:///foo.rbs", <<~RBS)
+      class Foo
+        def bar: () -> void
+      end
+    RBS
+    graph.resolve
+
+    assert_empty(graph.diagnostics)
+    assert_equal("Foo#bar()", graph["Foo#bar()"].name)
   end
 
   def test_index_source_with_unknown_language_id