TypeChecker constant resolution

castwide · Jul 2, 2022 · 84a6d4f · 84a6d4f
1 parent 37943d3
commit 84a6d4f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/solargraph/type_checker.rb b/lib/solargraph/type_checker.rb
@@ -120,7 +120,12 @@ def method_return_type_problems_for pin
     # @param pin [Pin::Base]
     # @return [Boolean]
     def resolved_constant? pin
-      api_map.get_constants('', pin.binder.tag).any? { |pin| pin.name == pin.return_type.namespace && ['Class', 'Module'].include?(pin.return_type.name) }
+      api_map.get_constants('', pin.binder.tag)
+        .select { |p| p.name == pin.return_type.namespace }
+        .any? do |p|
+          inferred = p.infer(api_map)
+          ['Class', 'Module'].include?(inferred.name)
+        end
     end
 
     def virtual_pin? pin

diff --git a/spec/type_checker/levels/normal_spec.rb b/spec/type_checker/levels/normal_spec.rb
@@ -168,6 +168,15 @@ def bar; end
       expect(checker.problems.first.message).to include('Unresolved')
     end
 
+    it 'reports unresolved return tags in root namespace' do
+      checker = type_checker(%(
+        # @return [UnknownClass]
+        def bar; end
+      ))
+      expect(checker.problems).to be_one
+      expect(checker.problems.first.message).to include('Unresolved')
+    end
+
     it 'validates existing type tags' do
       checker = type_checker(%(
         # @type [Integer]