solargraph 0.60.0 → 0.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3eff86e8759fbaaa9526cf9cceb70827c701f3b1925d58e1575870989d60e60
-  data.tar.gz: a60b5c8e9598afdca808c94fa68e2551d17f970b812ca64c3f00d530d0498fff
+  metadata.gz: 073de886e2394ba8a464555403cca26739b051fe0f4bd3b65eb46e9cab6b0fb4
+  data.tar.gz: d6b5a79ae2127dae156a63759f0bba81d333b7bcc6b96b8de451e79f2a173829
 SHA512:
-  metadata.gz: 201861185888f275b0c7690887cca60a76d0bb90955c514ba4336e23f2adb9907d305f5e930b08f03c3c388d81bfd40996cd54c0f854035aab5a60703c40f954
-  data.tar.gz: b37cc2ed827560a2365b77af0921c0240498dcb287e1a1ba064f0879a748c2d365f0e61cec610233b11521206ab402e83aebbdec5c897a21eb3e9f7313fba602
+  metadata.gz: a43dc1c04024b7f18919cc99497ce6c658cf80b9c98c2b48066f5609228e1949da3114ca3dcd41c47f1360a690ca0440c063aa1b3b229cb55d51e3367772861c
+  data.tar.gz: 551a79dfdb3007fd97063e65dac75dd68fbddee9b121005fb9de4e68e3870300fc1a1b7ba716c3787d593a140b50a08a81fb43e886a3d07bfd4be8493e70d937

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.60.1 - June 20, 2026
+- Process macro directives from included and extended modules (#1210)
+- Flaky pathname issue (#1211)
+- Check object equality in Pin::Base#nearly? (#1213)
+
 ## 0.60.0 - June 15, 2026
 - Add YARD macro support for DSL methods (#1187)
 - YARD macros - More typecheck fixes (#1188)

data/lib/solargraph/api_map.rb

@@ -140,13 +140,14 @@ module Solargraph
       Solargraph.logger.debug { "ApiMap#process_macros: named macros: #{store.named_macros.keys.join(', ')}" }
       source_maps.each do |source_map|
         method_candidates = source_map.macro_method_candidates(store.macro_method_names)
+        Solargraph.logger.warn "Candidates: #{method_candidates}"
         Solargraph.logger.debug { "ApiMap#process_macros: processing source map for #{source_map.filename} with #{method_candidates.size} macro method candidates" }
         method_candidates.each do |node|
           closure = source_map.locate_closure_pin(node.location.line, node.location.column)
           chain = Solargraph::Parser::ParserGem::NodeChainer.chain(node)
           if node.children[0].nil? && store.macro_method_name_pins.key?(node.children[1].to_s)
             match = store.macro_method_name_pins[node.children[1].to_s].find do |pin|
-              super_and_sub?(pin.namespace, closure.name)
+              get_complex_type_methods(closure.return_type).include?(pin)
             end
             if match
               match.macros.each do |macro|

data/lib/solargraph/pin/base.rb

@@ -491,7 +491,7 @@ module Solargraph
           # @sg-ignore Translate to something flow sensitive typing understands
           name == other.name &&
           # @sg-ignore flow sensitive typing needs to handle attrs
-          (closure == other.closure || (closure && closure.nearly?(other.closure))) &&
+          (closure.equal?(other.closure) || (closure&.nearly?(other.closure))) &&
           # @sg-ignore Translate to something flow sensitive typing understands
           (comments == other.comments ||
            # @sg-ignore Translate to something flow sensitive typing understands

data/lib/solargraph/shell.rb

@@ -4,10 +4,10 @@ require 'benchmark'
 require 'thor'
 require 'yard'
 require 'yaml'
+require 'pathname'
 require 'sord'
 require 'tmpdir'
 
-
 module Solargraph
   class Shell < Thor
     include Solargraph::ServerMethods

data/lib/solargraph/version.rb

@@ -1,23 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = ENV.fetch('SOLARGRAPH_FORCE_VERSION', '0.60.0')
-end
-
-# @generic T
-class A
-  # @yieldparam param0 [generic<T>]
-  def foo
-  end
-end
-
-class B < A # [Integer]
-  def bar
-    foo { |param0| }
-  end
-end
-
-b = B.new
-b.foo do |arg|
-  arg #=> Integer
+  VERSION = ENV.fetch('SOLARGRAPH_FORCE_VERSION', '0.60.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.60.1
 platform: ruby
 authors:
 - Fred Snyder