solargraph 0.59.0.dev.1 → 0.59.0

data/lib/solargraph/pin_cache.rb

@@ -1,434 +1,13 @@
+require 'yard-activesupport-concern'
 require 'fileutils'
+require 'pathname' # @todo Required by RBS but not loaded in some use cases
 require 'rbs'
-require 'rubygems'
 
 module Solargraph
-  class PinCache
-    include Logging
-
-    attr_reader :directory, :rbs_collection_path, :rbs_collection_config_path, :yard_plugins
-
-    # @param rbs_collection_path [String, nil]
-    # @param rbs_collection_config_path [String, nil]
-    # @param directory [String, nil]
-    # @param yard_plugins [Array<String>]
-    def initialize rbs_collection_path:, rbs_collection_config_path:,
-                   directory:,
-                   yard_plugins:
-      @rbs_collection_path = rbs_collection_path
-      @rbs_collection_config_path = rbs_collection_config_path
-      @directory = directory
-      @yard_plugins = yard_plugins
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    def cached? gemspec
-      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
-      combined_gem?(gemspec, rbs_version_cache_key)
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @param rebuild [Boolean] whether to rebuild the cache regardless of whether it already exists
-    # @param out [StringIO, IO, nil] output stream for logging
-    # @return [void]
-    def cache_gem gemspec:, rebuild: false, out: nil
-      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
-
-      build_yard, build_rbs_collection, build_combined =
-        calculate_build_needs(gemspec,
-                              rebuild: rebuild,
-                              rbs_version_cache_key: rbs_version_cache_key)
-
-      return unless build_yard || build_rbs_collection || build_combined
-
-      build_combine_and_cache(gemspec,
-                              rbs_version_cache_key,
-                              build_yard: build_yard,
-                              build_rbs_collection: build_rbs_collection,
-                              build_combined: build_combined,
-                              out: out)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param rbs_version_cache_key [String, nil]
-    def suppress_yard_cache? gemspec, rbs_version_cache_key
-      if gemspec.name == 'parser' && rbs_version_cache_key != RbsMap::CACHE_KEY_UNRESOLVED
-        # parser takes forever to build YARD pins, but has excellent RBS collection pins
-        return true
-      end
-      false
-    end
-
-    # @param out [StringIO, IO, nil] output stream for logging
-    # @param rebuild [Boolean] build pins regardless of whether we
-    #   have cached them already
-    #
-    # @return [void]
-    def cache_all_stdlibs rebuild: false, out: $stderr
-      possible_stdlibs.each do |stdlib|
-        RbsMap::StdlibMap.new(stdlib, rebuild: rebuild, out: out)
-      end
-    end
-
-    # @param path [String] require path that might be in the RBS stdlib collection
-    # @return [void]
-    def cache_stdlib_rbs_map path
-      # these are held in memory in RbsMap::StdlibMap
-      map = RbsMap::StdlibMap.load(path)
-      if map.resolved?
-        logger.debug { "Loading stdlib pins for #{path}" }
-        pins = map.pins
-        logger.debug { "Loaded #{pins.length} stdlib pins for #{path}" }
-        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, Bundler::LazySpecification]
-    #
-    # @return [String]
-    def lookup_rbs_version_cache_key gemspec
-      rbs_map = RbsMap.from_gemspec(gemspec, rbs_collection_path, rbs_collection_config_path)
-      rbs_map.cache_key
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param rbs_version_cache_key [String, nil]
-    # @param yard_pins [Array<Pin::Base>]
-    # @param rbs_collection_pins [Array<Pin::Base>]
-    # @return [void]
-    def cache_combined_pins gemspec, rbs_version_cache_key, yard_pins, rbs_collection_pins
-      combined_pins = GemPins.combine(yard_pins, rbs_collection_pins)
-      serialize_combined_gem(gemspec, rbs_version_cache_key, combined_pins)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [Array<Pin::Base>, nil]
-    def deserialize_combined_pin_cache gemspec
-      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
-
-      load_combined_gem(gemspec, rbs_version_cache_key)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param out [StringIO, IO, nil]
-    # @return [void]
-    def uncache_gem gemspec, out: nil
-      PinCache.uncache(yardoc_path(gemspec), out: out)
-      PinCache.uncache(yard_gem_path(gemspec), out: out)
-      uncache_by_prefix(rbs_collection_pins_path_prefix(gemspec), out: out)
-      uncache_by_prefix(combined_path_prefix(gemspec), out: out)
-      rbs_version_cache_key = lookup_rbs_version_cache_key(gemspec)
-      combined_pins_in_memory.delete([gemspec.name, gemspec.version, rbs_version_cache_key])
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    def yardoc_processing? gemspec
-      Yardoc.processing?(yardoc_path(gemspec))
-    end
-
-    # @return [Array<String>] a list of possible standard library names
-    def possible_stdlibs
-      # all dirs and .rb files in Gem::RUBYGEMS_DIR
-      Dir.glob(File.join(Gem::RUBYGEMS_DIR, '*')).map do |file_or_dir|
-        basename = File.basename(file_or_dir)
-        # remove .rb
-        # @sg-ignore flow sensitive typing should be able to handle redefinition
-        basename = basename[0..-4] if basename.end_with?('.rb')
-        basename
-      end.sort.uniq
-    rescue StandardError => e
-      logger.info { "Failed to get possible stdlibs: #{e.message}" }
-      # @sg-ignore Need to add nil check here
-      logger.debug { e.backtrace.join("\n") }
-      []
-    end
-
-    private
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param rebuild [Boolean] whether to rebuild the cache regardless of whether it already exists
-    # @param rbs_version_cache_key [String, nil] the cache key for the gem in the RBS collection
-    #
-    # @return [Array(Boolean, Boolean, Boolean)] whether to build YARD
-    #   pins, RBS collection pins, and combined pins
-    def calculate_build_needs gemspec, rebuild:, rbs_version_cache_key:
-      if rebuild
-        build_yard = true
-        build_rbs_collection = true
-        build_combined = true
-      else
-        build_yard = !yard_gem?(gemspec)
-        build_rbs_collection = !rbs_collection_pins?(gemspec, rbs_version_cache_key)
-        # @sg-ignore Need to add nil check here
-        build_combined = !combined_gem?(gemspec, rbs_version_cache_key) || build_yard || build_rbs_collection
-      end
-
-      build_yard = false if suppress_yard_cache?(gemspec, rbs_version_cache_key)
-
-      [build_yard, build_rbs_collection, build_combined]
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @param rbs_version_cache_key [String, nil]
-    # @param build_yard [Boolean]
-    # @param build_rbs_collection [Boolean]
-    # @param build_combined [Boolean]
-    # @param out [StringIO, IO, nil]
-    #
-    # @return [void]
-    def build_combine_and_cache gemspec,
-                                rbs_version_cache_key,
-                                build_yard:,
-                                build_rbs_collection:,
-                                build_combined:,
-                                out:
-      log_cache_info(gemspec, rbs_version_cache_key,
-                     build_yard: build_yard,
-                     build_rbs_collection: build_rbs_collection,
-                     build_combined: build_combined,
-                     out: out)
-      cache_yard_pins(gemspec, out) if build_yard
-      # this can be nil even if we aren't told to build it - see suppress_yard_cache?
-      yard_pins = deserialize_yard_pin_cache(gemspec) || []
-      cache_rbs_collection_pins(gemspec, out) if build_rbs_collection
-      rbs_collection_pins = deserialize_rbs_collection_cache(gemspec, rbs_version_cache_key) || []
-      cache_combined_pins(gemspec, rbs_version_cache_key, yard_pins, rbs_collection_pins) if build_combined
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param rbs_version_cache_key [String, nil]
-    # @param build_yard [Boolean]
-    # @param build_rbs_collection [Boolean]
-    # @param build_combined [Boolean]
-    # @param out [StringIO, IO, nil]
-    #
-    # @return [void]
-    def log_cache_info gemspec,
-                       rbs_version_cache_key,
-                       build_yard:,
-                       build_rbs_collection:,
-                       build_combined:,
-                       out:
-      type = []
-      type << 'YARD' if build_yard
-      rbs_source_desc = RbsMap.rbs_source_desc(rbs_version_cache_key)
-      type << rbs_source_desc if build_rbs_collection && !rbs_source_desc.nil?
-      # we'll build it anyway, but it won't take long to build with
-      # only a single source
-
-      # 'combining' is awkward terminology in this case
-      just_yard = build_yard && rbs_source_desc.nil?
-
-      type << 'combined' if build_combined && !just_yard
-      out&.puts("Caching #{type.join(' and ')} pins for gem #{gemspec.name}:#{gemspec.version}")
-    end
-
-    # @param gemspec [Gem::Specification]
-    # @param out [StringIO, IO, nil]
-    # @return [Array<Pin::Base>]
-    def cache_yard_pins gemspec, out
-      gem_yardoc_path = yardoc_path(gemspec)
-      Yardoc.build_docs(gem_yardoc_path, yard_plugins, gemspec) unless Yardoc.docs_built?(gem_yardoc_path)
-      pins = Yardoc.build_pins(gem_yardoc_path, gemspec, out: out)
-      serialize_yard_gem(gemspec, pins)
-      logger.info { "Cached #{pins.length} YARD pins for gem #{gemspec.name}:#{gemspec.version}" } unless pins.empty?
-      pins
-    end
-
-    # @return [Hash{Array(String, String, String) => Array<Pin::Base>}]
-    def combined_pins_in_memory
-      PinCache.all_combined_pins_in_memory[yard_plugins] ||= {}
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param _out [StringIO, IO, nil]
-    # @return [Array<Pin::Base>]
-    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 ||= []
-      serialize_rbs_collection_pins(gemspec, rbs_version_cache_key, pins)
-      logger.info do
-        unless pins.empty?
-          "Cached #{pins.length} RBS collection pins for gem #{gemspec.name} #{gemspec.version} with " \
-            "cache_key #{rbs_version_cache_key.inspect}"
-        end
-      end
-      pins
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [Array<Pin::Base>, nil]
-    def deserialize_yard_pin_cache gemspec
-      cached = load_yard_gem(gemspec)
-      if cached
-        cached
-      else
-        logger.debug "No YARD pin cache for #{gemspec.name}:#{gemspec.version}"
-        nil
-      end
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param rbs_version_cache_key [String, nil]
-    # @return [Array<Pin::Base>, nil]
-    def deserialize_rbs_collection_cache gemspec, rbs_version_cache_key
-      cached = load_rbs_collection_pins(gemspec, rbs_version_cache_key)
-      Solargraph.assert_or_log(:pin_cache_rbs_collection, 'Asked for non-existent rbs collection') if cached.nil?
-      logger.info do
-        "Loaded #{cached&.length} pins from RBS collection cache for #{gemspec.name}:#{gemspec.version}"
-      end
-      cached
-    end
-
-    # @return [Array<String>]
-    def yard_path_components
-      ["yard-#{YARD::VERSION}",
-       yard_plugins.sort.uniq.join('-')]
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [String]
-    def yardoc_path gemspec
-      File.join(PinCache.base_dir,
-                *yard_path_components,
-                "#{gemspec.name}-#{gemspec.version}.yardoc")
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [String]
-    def yard_gem_path gemspec
-      File.join(PinCache.work_dir, *yard_path_components, "#{gemspec.name}-#{gemspec.version}.ser")
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [Array<Pin::Base>, nil]
-    def load_yard_gem gemspec
-      PinCache.load(yard_gem_path(gemspec))
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param pins [Array<Pin::Base>]
-    # @return [void]
-    def serialize_yard_gem gemspec, pins
-      PinCache.save(yard_gem_path(gemspec), pins)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [Boolean]
-    def yard_gem? gemspec
-      exist?(yard_gem_path(gemspec))
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    # @return [String]
-    def rbs_collection_pins_path gemspec, hash
-      rbs_collection_pins_path_prefix(gemspec) + "#{hash || 0}.ser"
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [String]
-    def rbs_collection_pins_path_prefix gemspec
-      File.join(PinCache.work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-")
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    #
-    # @return [Array<Pin::Base>, nil]
-    def load_rbs_collection_pins gemspec, hash
-      PinCache.load(rbs_collection_pins_path(gemspec, hash))
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    # @param pins [Array<Pin::Base>]
-    # @return [void]
-    def serialize_rbs_collection_pins gemspec, hash, pins
-      PinCache.save(rbs_collection_pins_path(gemspec, hash), pins)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    # @return [String]
-    def combined_path gemspec, hash
-      File.join(combined_path_prefix(gemspec) + "-#{hash || 0}.ser")
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @return [String]
-    def combined_path_prefix gemspec
-      File.join(PinCache.work_dir, 'combined', yard_plugins.sort.join('-'), "#{gemspec.name}-#{gemspec.version}")
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    # @param pins [Array<Pin::Base>]
-    # @return [void]
-    def serialize_combined_gem gemspec, hash, pins
-      PinCache.save(combined_path(gemspec, hash), pins)
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String]
-    def combined_gem? gemspec, hash
-      exist?(combined_path(gemspec, hash))
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    # @return [Array<Pin::Base>, nil]
-    def load_combined_gem gemspec, hash
-      cached = combined_pins_in_memory[[gemspec.name, gemspec.version, hash]]
-      return cached if cached
-      loaded = PinCache.load(combined_path(gemspec, hash))
-      combined_pins_in_memory[[gemspec.name, gemspec.version, hash]] = loaded if loaded
-      loaded
-    end
-
-    # @param gemspec [Gem::Specification, Bundler::LazySpecification]
-    # @param hash [String, nil]
-    def rbs_collection_pins? gemspec, hash
-      exist?(rbs_collection_pins_path(gemspec, hash))
-    end
-
-    include Logging
-
-    # @param path [String]
-    def exist? *path
-      File.file? File.join(*path)
-    end
-
-    # @return [void]
-    # @param path_segments [Array<String>]
-    def uncache_by_prefix *path_segments, out: nil
-      path = File.join(*path_segments)
-      glob = "#{path}*"
-      out&.puts "Clearing pin cache in #{glob}"
-      Dir.glob(glob).each do |file|
-        next unless File.file?(file)
-        FileUtils.rm_rf file, secure: true
-        out&.puts "Clearing pin cache in #{file}"
-      end
-    end
-
+  module PinCache
     class << self
       include Logging
 
-      # @return [Hash{Array<String> => Hash{Array(String, String) =>
-      #   Array<Pin::Base>}}] yard plugins, then gemspec name and
-      #   version
-      def all_combined_pins_in_memory
-        @all_combined_pins_in_memory ||= {}
-      end
-
       # The base directory where cached YARD documentation and serialized pins are serialized
       #
       # @return [String]
@@ -440,47 +19,6 @@ module Solargraph
           File.join(Dir.home, '.cache', 'solargraph')
       end
 
-      # @param path_segments [Array<String>]
-      # @param out [IO, nil]
-      # @return [void]
-      def uncache *path_segments, out: nil
-        path = File.join(*path_segments)
-        if File.exist?(path)
-          FileUtils.rm_rf path, secure: true
-          out.puts "Clearing pin cache in #{path}" unless out.nil?
-        else
-          out&.puts "Pin cache file #{path} does not exist"
-        end
-      end
-
-      # @return [void]
-      # @param out [IO, nil]
-      # @param path_segments [Array<String>]
-      def uncache_by_prefix *path_segments, out: nil
-        path = File.join(*path_segments)
-        glob = "#{path}*"
-        out.puts "Clearing pin cache in #{glob}" unless out.nil?
-        Dir.glob(glob).each do |file|
-          next unless File.file?(file)
-          FileUtils.rm_rf file, secure: true
-          out.puts "Clearing pin cache in #{file}" unless out.nil?
-        end
-      end
-
-      # @param out [StringIO, IO, nil]
-      # @return [void]
-      def uncache_core out: nil
-        uncache(core_path, out: out)
-        # ApiMap keep this in memory
-        ApiMap.reset_core(out: out)
-      end
-
-      # @param out [StringIO, IO, nil]
-      # @return [void]
-      def uncache_stdlib out: nil
-        uncache(stdlib_path, out: out)
-      end
-
       # The working directory for the current Ruby, RBS, and Solargraph versions.
       #
       # @return [String]
@@ -490,6 +28,15 @@ module Solargraph
         File.join(base_dir, "ruby-#{RUBY_VERSION}", "rbs-#{RBS::VERSION}", "solargraph-#{Solargraph::VERSION}")
       end
 
+      # @param gemspec [Gem::Specification]
+      # @return [String]
+      def yardoc_path gemspec
+        File.join(base_dir,
+                  "yard-#{YARD::VERSION}",
+                  "yard-activesupport-concern-#{YARD::ActiveSupport::Concern::VERSION}",
+                  "#{gemspec.name}-#{gemspec.version}.yardoc")
+      end
+
       # @return [String]
       def stdlib_path
         File.join(work_dir, 'stdlib')
@@ -538,40 +85,40 @@ module Solargraph
 
       # @param gemspec [Gem::Specification]
       # @return [Array<Pin::Base>, nil]
-      def deserialize_yard_gem(gemspec)
+      def deserialize_yard_gem gemspec
         load(yard_gem_path(gemspec))
       end
 
       # @param gemspec [Gem::Specification]
       # @param pins [Array<Pin::Base>]
       # @return [void]
-      def serialize_yard_gem(gemspec, pins)
+      def serialize_yard_gem gemspec, pins
         save(yard_gem_path(gemspec), pins)
       end
 
       # @param gemspec [Gem::Specification]
       # @return [Boolean]
-      def has_yard?(gemspec)
+      def has_yard? gemspec
         exist?(yard_gem_path(gemspec))
       end
 
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [String]
-      def rbs_collection_path(gemspec, hash)
+      def rbs_collection_path gemspec, hash
         File.join(work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-#{hash || 0}.ser")
       end
 
       # @param gemspec [Gem::Specification]
       # @return [String]
-      def rbs_collection_path_prefix(gemspec)
+      def rbs_collection_path_prefix gemspec
         File.join(work_dir, 'rbs', "#{gemspec.name}-#{gemspec.version}-")
       end
 
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [Array<Pin::Base>, nil]
-      def deserialize_rbs_collection_gem(gemspec, hash)
+      def deserialize_rbs_collection_gem gemspec, hash
         load(rbs_collection_path(gemspec, hash))
       end
 
@@ -579,20 +126,20 @@ module Solargraph
       # @param hash [String, nil]
       # @param pins [Array<Pin::Base>]n
       # @return [void]
-      def serialize_rbs_collection_gem(gemspec, hash, pins)
+      def serialize_rbs_collection_gem gemspec, hash, pins
         save(rbs_collection_path(gemspec, hash), pins)
       end
 
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [String]
-      def combined_path(gemspec, hash)
+      def combined_path gemspec, hash
         File.join(work_dir, 'combined', "#{gemspec.name}-#{gemspec.version}-#{hash || 0}.ser")
       end
 
       # @param gemspec [Gem::Specification]
       # @return [String]
-      def combined_path_prefix(gemspec)
+      def combined_path_prefix gemspec
         File.join(work_dir, 'combined', "#{gemspec.name}-#{gemspec.version}-")
       end
 
@@ -600,7 +147,7 @@ module Solargraph
       # @param hash [String, nil]
       # @param pins [Array<Pin::Base>]
       # @return [void]
-      def serialize_combined_gem(gemspec, hash, pins)
+      def serialize_combined_gem gemspec, hash, pins
         save(combined_path(gemspec, hash), pins)
       end
 
@@ -614,17 +161,39 @@ module Solargraph
       # @param gemspec [Gem::Specification]
       # @param hash [String, nil]
       # @return [Boolean]
-      def has_rbs_collection?(gemspec, hash)
+      def has_rbs_collection? gemspec, hash
         exist?(rbs_collection_path(gemspec, hash))
       end
 
+      # @return [void]
+      def uncache_core
+        uncache(core_path)
+      end
+
+      # @return [void]
+      def uncache_stdlib
+        uncache(stdlib_path)
+      end
+
+      # @param gemspec [Gem::Specification]
+      # @param out [IO, StringIO, nil]
+      # @return [void]
+      def uncache_gem gemspec, out: nil
+        uncache(yardoc_path(gemspec), out: out)
+        uncache_by_prefix(rbs_collection_path_prefix(gemspec), out: out)
+        uncache(yard_gem_path(gemspec), out: out)
+        uncache_by_prefix(combined_path_prefix(gemspec), out: out)
+      end
+
       # @return [void]
       def clear
         FileUtils.rm_rf base_dir, secure: true
       end
 
+      private
+
       # @param file [String]
-      # @sg-ignore Marshal.load evaluates to boolean here which is wrong
+      # @sg-ignore Marshal.load returns Object; we know it's Array<Pin::Base>
       # @return [Array<Solargraph::Pin::Base>, nil]
       def load file
         return nil unless File.file?(file)
@@ -635,6 +204,11 @@ module Solargraph
         nil
       end
 
+      # @param path [String]
+      def exist? *path
+        File.file? File.join(*path)
+      end
+
       # @param file [String]
       # @param pins [Array<Pin::Base>]
       # @return [void]
@@ -646,19 +220,28 @@ module Solargraph
         logger.debug { "Cache#save: Saved #{pins.length} pins to #{file}" }
       end
 
-      def core?
-        File.file?(core_path)
-      end
-
-      # @param out [StringIO, IO, nil]
-      # @return [Array<Pin::Base>]
-      def cache_core out: $stderr
-        RbsMap::CoreMap.new.cache_core(out: out)
+      # @param path_segments [Array<String>]
+      # @return [void]
+      # @param [Object, nil] out
+      def uncache *path_segments, out: nil
+        path = File.join(*path_segments)
+        return unless File.exist?(path)
+        FileUtils.rm_rf path, secure: true
+        out&.puts "Clearing pin cache in #{path}"
       end
 
-      # @param path [String]
-      def exist? *path
-        File.file? File.join(*path)
+      # @return [void]
+      # @param path_segments [Array<String>]
+      # @param [Object, nil] out
+      def uncache_by_prefix *path_segments, out: nil
+        path = File.join(*path_segments)
+        glob = "#{path}*"
+        out&.puts "Clearing pin cache in #{glob}"
+        Dir.glob(glob).each do |file|
+          next unless File.file?(file)
+          FileUtils.rm_rf file, secure: true
+          out&.puts "Clearing pin cache in #{file}"
+        end
       end
     end
   end