From 63e88569befa5b50862c0f772a6c3edfb6ed6b96 Mon Sep 17 00:00:00 2001
From: Alexandre Terrasa <alexandre.terrasa@shopify.com>
Date: Wed, 12 Jun 2024 12:22:20 -0400
Subject: [PATCH] TMP

---
 .../requests/type_hierarchy_supertypes.rb     | 64 ++++++++++++++-----
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/lib/ruby_lsp/requests/type_hierarchy_supertypes.rb b/lib/ruby_lsp/requests/type_hierarchy_supertypes.rb
index d7ba9a0a90..1caf3b8ad5 100644
--- a/lib/ruby_lsp/requests/type_hierarchy_supertypes.rb
+++ b/lib/ruby_lsp/requests/type_hierarchy_supertypes.rb
@@ -33,28 +33,58 @@ def initialize(index, item)
       sig { override.returns(T.nilable(T::Array[Interface::TypeHierarchyItem])) }
       def perform
         name = @item[:name]
-        super_types = @index.linearized_ancestors_of(name)
+        entries = @index[name]
 
-        super_types.filter_map do |super_type_name|
-          next if super_type_name == name
+        parents = T.let([], T::Array[RubyIndexer::Entry::Namespace])
+        return [] unless entries&.any?
 
-          entries = @index[super_type_name]
-          next unless entries
+        entries.each do |entry|
+          next unless entry.is_a?(RubyIndexer::Entry::Namespace)
 
-          entries.map do |entry|
-            range = range_from_location(entry.location)
+          if entry.is_a?(RubyIndexer::Entry::Class)
+            parent_class_name = entry.parent_class
+            if parent_class_name
+              resolved_parent_entries = @index.resolve(parent_class_name, entry.nesting)
+              resolved_parent_entries&.each do |entry|
+                next unless entry.is_a?(RubyIndexer::Entry::Class)
 
-            Interface::TypeHierarchyItem.new(
-              name: entry.name,
-              kind: kind_for_entry(entry),
-              uri: URI::Generic.from_path(path: entry.file_path).to_s,
-              range: range,
-              selection_range: range,
-            )
+                parents << entry
+              end
+            end
           end
-        end.flatten
-      rescue RubyIndexer::Index::NonExistingNamespaceError
-        nil
+
+          entry.mixin_operations.each do |mixin_operation|
+            next if mixin_operation.is_a?(RubyIndexer::Entry::Extend)
+
+            mixin_name = mixin_operation.module_name
+            resolved_mixin_entries = @index.resolve(mixin_name, entry.nesting)
+            next unless resolved_mixin_entries
+
+            resolved_mixin_entries.each do |mixin_entry|
+              next unless mixin_entry.is_a?(RubyIndexer::Entry::Module)
+
+              parents << mixin_entry
+            end
+          end
+        end
+
+        parents.uniq.map { |entry| hierarchy_item(entry) }
+      end
+
+      private
+
+      sig { params(entry: RubyIndexer::Entry).returns(Interface::TypeHierarchyItem) }
+      def hierarchy_item(entry)
+        range = range_from_location(entry.location)
+
+        Interface::TypeHierarchyItem.new(
+          name: entry.name,
+          kind: kind_for_entry(entry),
+          uri: URI::Generic.from_path(path: entry.file_path).to_s,
+          range: range,
+          selection_range: range,
+          detail: entry.file_name,
+        )
       end
     end
   end