Chains resolve identical names with different contexts (#679)

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.51.3
+- Chains resolve identical names with different contexts (#679)
+
 ## 0.51.2 - February 1, 2025
 - Fix exception from parser when anonymous block forwarding is used (#740)
 - Parameterized Object types

lib/solargraph/pin/base.rb

@@ -217,7 +217,7 @@ def proxy return_type
       end
 
       def identity
-        @identity ||= "#{closure.context.namespace}|#{name}"
+        @identity ||= "#{closure.path}|#{name}"
       end
 
       def inspect

lib/solargraph/source/chain.rb

@@ -122,6 +122,7 @@ def infer_first_defined pins, context, api_map, locals
         pins.each do |pin|
           # Avoid infinite recursion
           next if @@inference_stack.include?(pin.identity)
+
           @@inference_stack.push pin.identity
           type = pin.typify(api_map)
           @@inference_stack.pop
@@ -143,10 +144,12 @@ def infer_first_defined pins, context, api_map, locals
         if possibles.empty?
           # Limit method inference recursion
           return ComplexType::UNDEFINED if @@inference_depth >= 10 && pins.first.is_a?(Pin::Method)
+
           @@inference_depth += 1
           pins.each do |pin|
             # Avoid infinite recursion
             next if @@inference_stack.include?(pin.identity)
+
             @@inference_stack.push pin.identity
             type = pin.probe(api_map)
             @@inference_stack.pop

lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.51.2'
+  VERSION = '0.51.3'
 end

spec/source_map/clip_spec.rb

@@ -1545,4 +1545,22 @@ def foo
     pin_names = api_map.clip_at('test.rb', [8, 5]).complete.pins.map(&:name)
     expect(pin_names).to include('some_method')
   end
+
+  it 'resolves name conflicts in pin identities' do
+    source = Solargraph::Source.load_string(%(
+      class A
+        def x
+          "string"
+        end
+      end
+
+      a = A.new
+      x = a.x
+      x
+    ), 'test.rb')
+    api_map = Solargraph::ApiMap.new.map(source)
+    clip = api_map.clip_at('test.rb', [9, 7])
+    type = clip.infer
+    expect(type.tag).to eq('String')
+  end
 end