solargraph 0.59.0.dev.2 → 0.59.0

data/lib/solargraph/doc_map.rb

@@ -5,15 +5,41 @@ require 'benchmark'
 require 'open3'
 
 module Solargraph
-  # A collection of pins generated from specific 'require' statements
-  # in code.  Multiple can be created per workspace, to represent the
-  # pins available in different files based on their particular
-  # 'require' lines.
+  # A collection of pins generated from required gems.
   #
   class DocMap
     include Logging
 
-    # @return [Workspace]
+    # @return [Array<String>]
+    attr_reader :requires
+    alias required requires
+
+    # @return [Array<Gem::Specification>]
+    attr_reader :preferences
+
+    # @return [Array<Pin::Base>]
+    attr_reader :pins
+
+    # @return [Array<Gem::Specification>]
+    def uncached_gemspecs
+      uncached_yard_gemspecs.concat(uncached_rbs_collection_gemspecs)
+                            .sort
+                            .uniq { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
+    end
+
+    # @return [Array<Gem::Specification>]
+    attr_reader :uncached_yard_gemspecs
+
+    # @return [Array<Gem::Specification>]
+    attr_reader :uncached_rbs_collection_gemspecs
+
+    # @return [String, nil]
+    attr_reader :rbs_collection_path
+
+    # @return [String, nil]
+    attr_reader :rbs_collection_config_path
+
+    # @return [Workspace, nil]
     attr_reader :workspace
 
     # @return [Environ]
@@ -21,70 +47,81 @@ module Solargraph
 
     # @param requires [Array<String>]
     # @param workspace [Workspace, nil]
-    # @param out [IO, nil] output stream for logging
+    # @param [Object] out
     def initialize requires, workspace, out: $stderr
-      @provided_requires = requires.compact
+      @requires = requires.compact
       @workspace = workspace
+      @rbs_collection_path = workspace&.rbs_collection_path
+      @rbs_collection_config_path = workspace&.rbs_collection_config_path
+      @environ = Convention.for_global(self)
+      @requires.concat @environ.requires if @environ
+      load_serialized_gem_pins
+      pins.concat @environ.pins
       @out = out
     end
 
-    # @return [Array<String>]
-    def requires
-      @requires ||= @provided_requires + (workspace.global_environ&.requires || [])
-    end
-    alias required requires
-
-    # @sg-ignore flow sensitive typing needs to understand reassignment
-    # @return [Array<Gem::Specification>]
-    def uncached_gemspecs
-      if @uncached_gemspecs.nil?
-        @uncached_gemspecs = []
-        pins # force lazy-loaded pin lookup
+    # @param out [IO, StringIO, nil]
+    # @return [void]
+    # @param [Boolean] rebuild
+    def cache_all! out, rebuild: false
+      # if we log at debug level:
+      if logger.info?
+        gem_desc = uncached_gemspecs.map { |gemspec| "#{gemspec.name}:#{gemspec.version}" }.join(', ')
+        logger.info "Caching pins for gems: #{gem_desc}" unless uncached_gemspecs.empty?
       end
-      @uncached_gemspecs
-    end
-
-    # @return [Array<Pin::Base>]
-    def pins
-      @pins ||= load_serialized_gem_pins + (workspace.global_environ&.pins || [])
+      logger.debug { "Caching for YARD: #{uncached_yard_gemspecs.map(&:name)}" }
+      logger.debug { "Caching for RBS collection: #{uncached_rbs_collection_gemspecs.map(&:name)}" }
+      load_serialized_gem_pins
+      uncached_gemspecs.each do |gemspec|
+        cache(gemspec, rebuild: rebuild, out: out)
+      end
+      load_serialized_gem_pins
+      @uncached_rbs_collection_gemspecs = []
+      @uncached_yard_gemspecs = []
     end
 
+    # @param gemspec [Gem::Specification]
+    # @param out [IO, StringIO, nil]
     # @return [void]
-    def reset_pins!
-      @uncached_gemspecs = nil
-      @pins = nil
-    end
-
-    # @return [Solargraph::PinCache]
-    def pin_cache
-      @pin_cache ||= workspace.fresh_pincache
+    def cache_yard_pins gemspec, out
+      pins = GemPins.build_yard_pins(yard_plugins, gemspec)
+      PinCache.serialize_yard_gem(gemspec, pins)
+      logger.info { "Cached #{pins.length} YARD pins for gem #{gemspec.name}:#{gemspec.version}" } unless pins.empty?
     end
 
-    def any_uncached?
-      uncached_gemspecs.any?
+    # @param gemspec [Gem::Specification]
+    # @param out [IO, StringIO, nil]
+    # @return [void]
+    def cache_rbs_collection_pins gemspec, out
+      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
+      pins = rbs_map.pins
+      rbs_version_cache_key = rbs_map.cache_key
+      # cache pins even if result is zero, so we don't retry building pins
+      pins ||= []
+      PinCache.serialize_rbs_collection_gem(gemspec, rbs_version_cache_key, pins)
+      logger.info { "Cached #{pins.length} RBS collection pins for gem #{gemspec.name} #{gemspec.version} with cache_key #{rbs_version_cache_key.inspect}" unless pins.empty? }
     end
 
-    # Cache all pins needed for the sources in this doc_map
-    # @param out [StringIO, IO, nil] output stream for logging
+    # @param gemspec [Gem::Specification]
     # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
+    # @param out [IO, StringIO, nil] output stream for logging
     # @return [void]
-    def cache_doc_map_gems! out, rebuild: false
-      unless uncached_gemspecs.empty?
-        logger.info do
-          gem_desc = uncached_gemspecs.map { |gemspec| "#{gemspec.name}:#{gemspec.version}" }.join(', ')
-          "Caching pins for gems: #{gem_desc}"
-        end
-      end
-      time = Benchmark.measure do
-        uncached_gemspecs.each do |gemspec|
-          cache(gemspec, rebuild: rebuild, out: out)
-        end
-      end
-      milliseconds = (time.real * 1000).round
-      if (milliseconds > 500) && uncached_gemspecs.any? && out && uncached_gemspecs.any?
-        out.puts "Built #{uncached_gemspecs.length} gems in #{milliseconds} ms"
+    def cache gemspec, rebuild: false, out: nil
+      build_yard = uncached_yard_gemspecs.include?(gemspec) || rebuild
+      build_rbs_collection = uncached_rbs_collection_gemspecs.include?(gemspec) || rebuild
+      if build_yard || build_rbs_collection
+        type = []
+        type << 'YARD' if build_yard
+        type << 'RBS collection' if build_rbs_collection
+        out&.puts("Caching #{type.join(' and ')} pins for gem #{gemspec.name}:#{gemspec.version}")
       end
-      reset_pins!
+      cache_yard_pins(gemspec, out) if build_yard
+      cache_rbs_collection_pins(gemspec, out) if build_rbs_collection
+    end
+
+    # @return [Array<Gem::Specification>]
+    def gemspecs
+      @gemspecs ||= required_gems_map.values.compact.flatten
     end
 
     # @return [Array<String>]
@@ -92,108 +129,310 @@ module Solargraph
       @unresolved_requires ||= required_gems_map.select { |_, gemspecs| gemspecs.nil? }.keys
     end
 
-    # @return [Array<Gem::Specification>]
-    # @param out [IO, nil]
-    def dependencies out: $stderr
-      @dependencies ||=
-        begin
-          gem_deps = gemspecs
-                     .flat_map { |spec| workspace.fetch_dependencies(spec, out: out) }
-                     .uniq(&:name)
-          stdlib_deps = gemspecs
-                        .flat_map { |spec| workspace.stdlib_dependencies(spec.name) }
-                        .flat_map { |dep_name| workspace.resolve_require(dep_name) }
-                        .compact
-          existing_gems = gemspecs.map(&:name)
-          (gem_deps + stdlib_deps).reject { |gemspec| existing_gems.include? gemspec.name }
-        end
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    def self.all_yard_gems_in_memory
+      @all_yard_gems_in_memory ||= {}
     end
 
-    # Cache gem documentation if needed for this doc_map
-    #
-    # @param gemspec [Gem::Specification]
-    # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
-    # @param out [StringIO, IO, nil] output stream for logging
-    #
-    # @return [void]
-    def cache gemspec, rebuild: false, out: nil
-      pin_cache.cache_gem(gemspec: gemspec,
-                          rebuild: rebuild,
-                          out: out)
+    # @return [Hash{String => Hash{Array(String, String) => Array<Pin::Base>}}] stored by RBS collection path
+    def self.all_rbs_collection_gems_in_memory
+      @all_rbs_collection_gems_in_memory ||= {}
     end
 
-    private
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    def yard_pins_in_memory
+      self.class.all_yard_gems_in_memory
+    end
 
-    # @return [Array<Gem::Specification>]
-    def gemspecs
-      @gemspecs ||= required_gems_map.values.compact.flatten
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    def rbs_collection_pins_in_memory
+      # @sg-ignore rbs_collection_path is String | nil but used as hash key
+      self.class.all_rbs_collection_gems_in_memory[rbs_collection_path] ||= {}
     end
 
-    # @param out [IO, nil]
-    # @return [Array<Pin::Base>]
-    def load_serialized_gem_pins out: @out
-      serialized_pins = []
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    def self.all_combined_pins_in_memory
+      @all_combined_pins_in_memory ||= {}
+    end
+
+    # @todo this should also include an index by the hash of the RBS collection
+    # @return [Hash{Array(String, String) => Array<Pin::Base>}] Indexed by gemspec name and version
+    def combined_pins_in_memory
+      self.class.all_combined_pins_in_memory
+    end
+
+    # @return [Array<String>]
+    def yard_plugins
+      @environ.yard_plugins
+    end
+
+    # @return [Set<Gem::Specification>]
+    def dependencies
+      @dependencies ||= (gemspecs.flat_map { |spec| fetch_dependencies(spec) } - gemspecs).to_set
+    end
+
+    private
+
+    # @return [void]
+    def load_serialized_gem_pins
+      @pins = []
+      @uncached_yard_gemspecs = []
+      @uncached_rbs_collection_gemspecs = []
       with_gemspecs, without_gemspecs = required_gems_map.partition { |_, v| v }
       # @type [Array<String>]
-      missing_paths = without_gemspecs.to_h.keys
+      paths = without_gemspecs.to_h.keys
       # @type [Array<Gem::Specification>]
-      gemspecs = with_gemspecs.to_h.values.flatten.compact + dependencies(out: out).to_a
-
-      # if we are type checking a gem project, we should not include
-      # pins from rbs or yard from that gem here - we use our own
-      # parser for those pins
-
-      # @param gemspec [Gem::Specification, Bundler::LazySpecification, Bundler::StubSpecification]
-      gemspecs.reject! do |gemspec|
-        gemspec.respond_to?(:source) &&
-          gemspec.source.instance_of?(Bundler::Source::Gemspec) &&
-          gemspec.source.respond_to?(:path) &&
-          gemspec.source.path == Pathname.new('.')
-      end
-
-      missing_paths.each do |path|
-        # this will load from disk if needed; no need to manage
-        # uncached_gemspecs to trigger that later
-        stdlib_name_guess = path.split('/').first
-
-        # try to resolve the stdlib name
-        # @type [Array<String>]
-        deps = workspace.stdlib_dependencies(stdlib_name_guess) || []
-        [stdlib_name_guess, *deps].compact.each do |potential_stdlib_name|
-          # @sg-ignore Need to support splatting in literal array
-          rbs_pins = pin_cache.cache_stdlib_rbs_map potential_stdlib_name
-          serialized_pins.concat rbs_pins if rbs_pins
-        end
+      gemspecs = with_gemspecs.to_h.values.flatten.compact + dependencies.to_a
+
+      paths.each do |path|
+        deserialize_stdlib_rbs_map path
       end
 
-      serialized_pins.length
+      logger.debug { 'DocMap#load_serialized_gem_pins: Combining pins...' }
       time = Benchmark.measure do
         gemspecs.each do |gemspec|
-          # only deserializes already-cached gems
-          gemspec_pins = pin_cache.deserialize_combined_pin_cache gemspec
-          if gemspec_pins
-            serialized_pins.concat gemspec_pins
-          else
-            uncached_gemspecs << gemspec
-          end
+          pins = deserialize_combined_pin_cache gemspec
+          @pins.concat pins if pins
         end
       end
-      serialized_pins.length
-      milliseconds = (time.real * 1000).round
-      if (milliseconds > 500) && out && gemspecs.any?
-        out.puts "Deserialized #{serialized_pins.length} gem pins from #{PinCache.base_dir} in #{milliseconds} ms"
-      end
-      uncached_gemspecs.uniq! { |gemspec| "#{gemspec.name}:#{gemspec.version}" }
-      serialized_pins
+      logger.info { "DocMap#load_serialized_gem_pins: Loaded and processed serialized pins together in #{time.real} seconds" }
+      @uncached_yard_gemspecs.uniq!
+      @uncached_rbs_collection_gemspecs.uniq!
+      nil
     end
 
     # @return [Hash{String => Array<Gem::Specification>}]
     def required_gems_map
-      @required_gems_map ||= requires.to_h { |path| [path, workspace.resolve_require(path)] }
+      @required_gems_map ||= requires.to_h { |path| [path, resolve_path_to_gemspecs(path)] }
+    end
+
+    # @return [Hash{String => Gem::Specification}]
+    def preference_map
+      @preference_map ||= preferences.to_h { |gemspec| [gemspec.name, gemspec] }
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>, nil]
+    def deserialize_yard_pin_cache gemspec
+      if yard_pins_in_memory.key?([gemspec.name, gemspec.version])
+        return yard_pins_in_memory[[gemspec.name, gemspec.version]]
+      end
+
+      cached = PinCache.deserialize_yard_gem(gemspec)
+      if cached
+        logger.info { "Loaded #{cached.length} cached YARD pins from #{gemspec.name}:#{gemspec.version}" }
+        yard_pins_in_memory[[gemspec.name, gemspec.version]] = cached
+        cached
+      else
+        logger.debug "No YARD pin cache for #{gemspec.name}:#{gemspec.version}"
+        @uncached_yard_gemspecs.push gemspec
+        nil
+      end
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [void]
+    def deserialize_combined_pin_cache gemspec
+      unless combined_pins_in_memory[[gemspec.name, gemspec.version]].nil?
+        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
+      end
+
+      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
+      rbs_version_cache_key = rbs_map.cache_key
+
+      cached = PinCache.deserialize_combined_gem(gemspec, rbs_version_cache_key)
+      if cached
+        logger.info { "Loaded #{cached.length} cached YARD pins from #{gemspec.name}:#{gemspec.version}" }
+        combined_pins_in_memory[[gemspec.name, gemspec.version]] = cached
+        return combined_pins_in_memory[[gemspec.name, gemspec.version]]
+      end
+
+      rbs_collection_pins = deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
+
+      yard_pins = deserialize_yard_pin_cache gemspec
+
+      if !rbs_collection_pins.nil? && !yard_pins.nil?
+        logger.debug { "Combining pins for #{gemspec.name}:#{gemspec.version}" }
+        combined_pins = GemPins.combine(yard_pins, rbs_collection_pins)
+        PinCache.serialize_combined_gem(gemspec, rbs_version_cache_key, combined_pins)
+        combined_pins_in_memory[[gemspec.name, gemspec.version]] = combined_pins
+        logger.info { "Generated #{combined_pins_in_memory[[gemspec.name, gemspec.version]].length} combined pins for #{gemspec.name} #{gemspec.version}" }
+        return combined_pins
+      end
+
+      if !yard_pins.nil?
+        logger.debug { "Using only YARD pins for #{gemspec.name}:#{gemspec.version}" }
+        combined_pins_in_memory[[gemspec.name, gemspec.version]] = yard_pins
+        combined_pins_in_memory[[gemspec.name, gemspec.version]]
+      elsif !rbs_collection_pins.nil?
+        logger.debug { "Using only RBS collection pins for #{gemspec.name}:#{gemspec.version}" }
+        combined_pins_in_memory[[gemspec.name, gemspec.version]] = rbs_collection_pins
+        combined_pins_in_memory[[gemspec.name, gemspec.version]]
+      else
+        logger.debug { "Pins not yet cached for #{gemspec.name}:#{gemspec.version}" }
+        nil
+      end
+    end
+
+    # @param path [String] require path that might be in the RBS stdlib collection
+    # @return [void]
+    def deserialize_stdlib_rbs_map path
+      map = RbsMap::StdlibMap.load(path)
+      if map.resolved?
+        logger.debug { "Loading stdlib pins for #{path}" }
+        @pins.concat map.pins
+        logger.debug { "Loaded #{map.pins.length} stdlib pins for #{path}" }
+        map.pins
+      else
+        # @todo Temporarily ignoring unresolved `require 'set'`
+        logger.debug { "Require path #{path} could not be resolved in RBS" } unless path == 'set'
+        nil
+      end
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param rbs_version_cache_key [String]
+    # @return [Array<Pin::Base>, nil]
+    def deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
+      return if rbs_collection_pins_in_memory.key?([gemspec, rbs_version_cache_key])
+      cached = PinCache.deserialize_rbs_collection_gem(gemspec, rbs_version_cache_key)
+      if cached
+        logger.info { "Loaded #{cached.length} pins from RBS collection cache for #{gemspec.name}:#{gemspec.version}" } unless cached.empty?
+        rbs_collection_pins_in_memory[[gemspec, rbs_version_cache_key]] = cached
+        cached
+      else
+        logger.debug "No RBS collection pin cache for #{gemspec.name} #{gemspec.version}"
+        @uncached_rbs_collection_gemspecs.push gemspec
+        nil
+      end
+    end
+
+    # @param path [String]
+    # @return [::Array<Gem::Specification>, nil]
+    def resolve_path_to_gemspecs path
+      return nil if path.empty?
+      return gemspecs_required_from_bundler if path == 'bundler/require'
+
+      # @type [Gem::Specification, nil]
+      gemspec = Gem::Specification.find_by_path(path)
+      if gemspec.nil?
+        gem_name_guess = path.split('/').first
+        begin
+          # this can happen when the gem is included via a local path in
+          # a Gemfile; Gem doesn't try to index the paths in that case.
+          #
+          # See if we can make a good guess:
+          gemspec = Gem::Specification.find_by_name(gem_name_guess)
+        rescue Gem::MissingSpecError
+          logger.debug { "Require path #{path} could not be resolved to a gem via find_by_path or guess of #{gem_name_guess}" }
+          []
+        end
+      end
+      return nil if gemspec.nil?
+      [gemspec_or_preference(gemspec)]
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Gem::Specification]
+    def gemspec_or_preference gemspec
+      # :nocov: dormant feature
+      return gemspec unless preference_map.key?(gemspec.name)
+      return gemspec if gemspec.version == preference_map[gemspec.name].version
+
+      change_gemspec_version gemspec, preference_map[gemspec.name].version
+      # :nocov:
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @param version [Gem::Version, String]
+    # @return [Gem::Specification]
+    def change_gemspec_version gemspec, version
+      Gem::Specification.find_by_name(gemspec.name, "= #{version}")
+    rescue Gem::MissingSpecError
+      Solargraph.logger.info "Gem #{gemspec.name} version #{version} not found. Using #{gemspec.version} instead"
+      gemspec
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Gem::Specification>]
+    def fetch_dependencies gemspec
+      # @param spec [Gem::Dependency]
+      # @param deps [Set<Gem::Specification>]
+      only_runtime_dependencies(gemspec).each_with_object(Set.new) do |spec, deps|
+        Solargraph.logger.info "Adding #{spec.name} dependency for #{gemspec.name}"
+        dep = Gem.loaded_specs[spec.name]
+        # @todo is next line necessary?
+        dep ||= Gem::Specification.find_by_name(spec.name, spec.requirement)
+        deps.merge fetch_dependencies(dep) if deps.add?(dep)
+      rescue Gem::MissingSpecError
+        Solargraph.logger.warn "Gem dependency #{spec.name} for #{gemspec.name} not found in RubyGems."
+      end.to_a
+    end
+
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Gem::Dependency>]
+    def only_runtime_dependencies gemspec
+      gemspec.dependencies - gemspec.development_dependencies
     end
 
     def inspect
       self.class.inspect
     end
+
+    # @return [Array<Gem::Specification>, nil]
+    def gemspecs_required_from_bundler
+      # @todo Handle projects with custom Bundler/Gemfile setups
+      return unless workspace&.gemfile?
+
+      # @sg-ignore workspace is checked for nil above
+      if workspace.gemfile? && Bundler.definition&.lockfile&.to_s&.start_with?(workspace.directory) # rubocop:disable Style/SafeNavigationChainLength
+        # Find only the gems bundler is now using
+        Bundler.definition.locked_gems.specs.flat_map do |lazy_spec|
+          logger.info "Handling #{lazy_spec.name}:#{lazy_spec.version}"
+          [Gem::Specification.find_by_name(lazy_spec.name, lazy_spec.version)]
+        rescue Gem::MissingSpecError => e
+          logger.info("Could not find #{lazy_spec.name}:#{lazy_spec.version} with find_by_name, falling back to guess")
+          # can happen in local filesystem references
+          specs = resolve_path_to_gemspecs lazy_spec.name
+          logger.warn "Gem #{lazy_spec.name} #{lazy_spec.version} from bundle not found: #{e}" if specs.nil?
+          next specs
+        end.compact
+      else
+        logger.info 'Fetching gemspecs required from Bundler (bundler/require)'
+        gemspecs_required_from_external_bundle
+      end
+    end
+
+    # @return [Array<Gem::Specification>]
+    def gemspecs_required_from_external_bundle
+      logger.info 'Fetching gemspecs required from external bundle'
+      return [] unless workspace&.directory
+
+      Solargraph.with_clean_env do
+        cmd = [
+          'ruby', '-e',
+          # @sg-ignore return above ensures workspace.directory is not nil
+          "require 'bundler'; require 'json'; Dir.chdir('#{workspace.directory}') { puts Bundler.definition.locked_gems.specs.map { |spec| [spec.name, spec.version] }.to_h.to_json }"
+        ]
+        o, e, s = Open3.capture3(*cmd)
+        if s.success?
+          Solargraph.logger.debug "External bundle: #{o}"
+          hash = o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
+          hash.flat_map do |name, version|
+            Gem::Specification.find_by_name(name, version)
+          rescue Gem::MissingSpecError => e
+            logger.info("Could not find #{name}:#{version} with find_by_name, falling back to guess")
+            # can happen in local filesystem references
+            specs = resolve_path_to_gemspecs name
+            logger.warn "Gem #{name} #{version} from bundle not found: #{e}" if specs.nil?
+            next specs
+          end.compact
+        else
+          # @sg-ignore return above ensures workspace.directory is not nil
+          Solargraph.logger.warn "Failed to load gems from bundle at #{workspace.directory}: #{e}"
+          []
+        end
+      end
+    end
   end
 end

data/lib/solargraph/gem_pins.rb

@@ -43,37 +43,36 @@ module Solargraph
       out
     end
 
+    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
+    # @param gemspec [Gem::Specification]
+    # @return [Array<Pin::Base>]
+    def self.build_yard_pins yard_plugins, gemspec
+      Yardoc.cache(yard_plugins, gemspec) unless Yardoc.cached?(gemspec)
+      return [] unless Yardoc.cached?(gemspec)
+      yardoc = Yardoc.load!(gemspec)
+      YardMap::Mapper.new(yardoc, gemspec).map
+    end
+
     # @param yard_pins [Array<Pin::Base>]
     # @param rbs_pins [Array<Pin::Base>]
     #
     # @return [Array<Pin::Base>]
     def self.combine yard_pins, rbs_pins
       in_yard = Set.new
-      rbs_store = Solargraph::ApiMap::Store.new(rbs_pins)
+      rbs_api_map = Solargraph::ApiMap.new(pins: rbs_pins)
       combined = yard_pins.map do |yard_pin|
         in_yard.add yard_pin.path
-        rbs_pin = rbs_store.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
-
-        next yard_pin unless rbs_pin && yard_pin.is_a?(Pin::Method)
+        rbs_pin = rbs_api_map.get_path_pins(yard_pin.path).filter { |pin| pin.is_a? Pin::Method }.first
+        next yard_pin unless rbs_pin && yard_pin.instance_of?(Pin::Method)
 
         unless rbs_pin
-          logger.debug do
-            "GemPins.combine: No rbs pin for #{yard_pin.path} - using YARD's '#{yard_pin.inspect} (return_type=#{yard_pin.return_type}; signatures=#{yard_pin.signatures})"
-          end
+          # @sg-ignore https://github.com/castwide/solargraph/pull/1114
+          logger.debug { "GemPins.combine: No rbs pin for #{yard_pin.path} - using YARD's '#{yard_pin.inspect} (return_type=#{yard_pin.return_type}; signatures=#{yard_pin.signatures})" }
           next yard_pin
         end
 
-        # at this point both yard_pins and rbs_pins are methods or
-        # method aliases.  if not plain methods, prefer the YARD one
-        next yard_pin if rbs_pin.class != Pin::Method
-
-        next rbs_pin if yard_pin.class != Pin::Method
-
-        # both are method pins
         out = combine_method_pins(rbs_pin, yard_pin)
-        logger.debug do
-          "GemPins.combine: Combining yard.path=#{yard_pin.path} - rbs=#{rbs_pin.inspect} with yard=#{yard_pin.inspect} into #{out}"
-        end
+        logger.debug { "GemPins.combine: Combining yard.path=#{yard_pin.path} - rbs=#{rbs_pin.inspect} with yard=#{yard_pin.inspect} into #{out}" }
         out
       end
       in_rbs_only = rbs_pins.select do |pin|