Format constant declarations relative to their enclosing scope

Author: pvcresin

lib/typeprof/core/service.rb

@@ -414,6 +414,21 @@ def completion(path, trigger, pos)
       end
     end
 
+    def format_declared_const_path(cpath, stack)
+      scope_cpath =
+        stack.reverse_each.find do |entry|
+          (entry.is_a?(AST::ClassNode) || entry.is_a?(AST::ModuleNode)) &&
+            entry.static_cpath &&
+            !entry.static_cpath.empty?
+        end&.static_cpath
+
+      return cpath.join("::") unless scope_cpath
+      return cpath.join("::") unless cpath[0, scope_cpath.size] == scope_cpath
+
+      rel_cpath = cpath.drop(scope_cpath.size)
+      rel_cpath.empty? ? cpath.join("::") : rel_cpath.join("::")
+    end
+
     def dump_declarations(path)
       stack = []
       out = []
@@ -465,7 +480,7 @@ def dump_declarations(path)
         when AST::ConstantWriteNode
           if node.static_cpath
             if event == :enter
-              out << "  " * stack.size + "#{ node.static_cpath.join("::") }: #{ node.ret.show }"
+              out << "  " * stack.size + "#{ format_declared_const_path(node.static_cpath, stack) }: #{ node.ret.show }"
             end
           end
         else

scenario/const/basic1.rb

@@ -12,7 +12,7 @@ def foo(_)
 
 ## assert
 class C
-  C::X: Integer
+  X: Integer
 end
 class D < C
 end

scenario/const/basic2.rb

@@ -11,7 +11,7 @@ def foo
 ## assert
 C: Integer
 class Foo
-  Foo::C: Float
+  C: Float
   def foo: -> Integer
 end
 Foo::Bar: :bar

scenario/known-issues/const-scope.rb scenario/const/const-scope.rbscenario/known-issues/const-scope.rb renamed to scenario/const/const-scope.rb

@@ -14,7 +14,7 @@ def check
 ## diagnostics
 ## assert
 module M
-  M::C: :test
+  C: :test
 end
 class C
   include M

scenario/const/module_const.rb

@@ -6,5 +6,5 @@ class C
 
 ## assert
 class C
-  C::D: (Integer | String)
+  D: (Integer | String)
 end

scenario/known-issues/multi-const-write.rb

@@ -38,7 +38,7 @@ def test_attr=(x)
 ## diagnostics
 ## assert
 class C
-  C::D: :ConstD
+  D: :ConstD
   def get_lv: -> (:LVar | :LVar0)
   def set_iv: -> (:IVar | :IVar0)
   def get_iv: -> (:IVar | :IVar0)

scenario/variable/and_write.rb

@@ -42,8 +42,8 @@ def test_attr=(x)
 ## diagnostics
 ## assert
 class C
-  C::D: Integer
-  C::D: Integer
+  D: Integer
+  D: Integer
   def get_lv: -> Integer
   def set_iv: -> Integer
   def get_iv: -> Integer

scenario/variable/operator_write.rb

@@ -36,7 +36,7 @@ def test_attr=(x)
 ## diagnostics
 ## assert
 class C
-  C::D: :ConstD
+  D: :ConstD
   def get_lv: -> :LVar
   def set_iv: -> :IVar
   def get_iv: -> :IVar