From 0e65ddee37adb1937a81d519a04437ab5fa59abc Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@aider.chat>
Date: Thu, 6 Mar 2025 16:26:41 -0800
Subject: [PATCH] fix ruby with ts 0.23

---
 aider/repomap.py            | 17 +++++++++++++++++
 tests/basic/test_repomap.py |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/aider/repomap.py b/aider/repomap.py
index 750bd6529..ac13e9b0d 100644
--- a/aider/repomap.py
+++ b/aider/repomap.py
@@ -249,6 +249,7 @@ class RepoMap:
 
         # miss!
         data = list(self.get_tags_raw(fname, rel_fname))
+        dump(data)
 
         # Update the cache
         try:
@@ -287,6 +288,7 @@ class RepoMap:
         captures = query.captures(tree.root_node)
 
         saw = set()
+        dump(USING_TSL_PACK)
         if USING_TSL_PACK:
             all_nodes = []
             for tag, nodes in captures.items():
@@ -295,6 +297,7 @@ class RepoMap:
             all_nodes = list(captures)
 
         for node, tag in all_nodes:
+            dump(node, tag)
             if tag.startswith("name.definition."):
                 kind = "def"
             elif tag.startswith("name.reference."):
@@ -311,6 +314,7 @@ class RepoMap:
                 kind=kind,
                 line=node.start_point[0],
             )
+            dump(result)
 
             yield result
 
@@ -407,6 +411,7 @@ class RepoMap:
                 personalization[rel_fname] = personalize
 
             tags = list(self.get_tags(fname, rel_fname))
+            dump(tags)
             if tags is None:
                 continue
 
@@ -431,11 +436,22 @@ class RepoMap:
 
         G = nx.MultiDiGraph()
 
+        # Add a small self-edge for every definition that has no references
+        # Helps with tree-sitter 0.23.2 with ruby, where "def greet(name)"
+        # isn't counted as a def AND a ref. tree-sitter 0.24.0 does.
+        for ident in defines.keys():
+            dump(ident)
+            if ident in references:
+                continue
+            for definer in defines[ident]:
+                G.add_edge(definer, definer, weight=0.1, ident=ident)
+
         for ident in idents:
             if progress:
                 progress()
 
             definers = defines[ident]
+            dump(ident, definers)
             if ident in mentioned_idents:
                 mul = 10
             elif ident.startswith("_"):
@@ -454,6 +470,7 @@ class RepoMap:
 
                     G.add_edge(referencer, definer, weight=mul * num_refs, ident=ident)
 
+        dump(G.nodes)
         if not references:
             pass
 
diff --git a/tests/basic/test_repomap.py b/tests/basic/test_repomap.py
index d5770b2c1..c3920d846 100644
--- a/tests/basic/test_repomap.py
+++ b/tests/basic/test_repomap.py
@@ -291,10 +291,10 @@ class TestRepoMapAllLanguages(unittest.TestCase):
             "java": ("java", "Greeting"),
             "javascript": ("js", "Person"),
             "kotlin": ("kt", "Greeting"),
-            "ocaml": ("ml", "Greeter"),
+            # "ocaml": ("ml", "Greeter"), # not supported in tsl-pack (yet?)
             "php": ("php", "greet"),
             "python": ("py", "Person"),
-            "ql": ("ql", "greet"),
+            # "ql": ("ql", "greet"), # not supported in tsl-pack (yet?)
             "ruby": ("rb", "greet"),
             "rust": ("rs", "Person"),
             "typescript": ("ts", "greet"),