solargraph 0.50.0 → 0.58.2

data/lib/solargraph/yard_map.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'yard'
-require 'yard-solargraph'
-require 'rubygems/package'
-require 'set'
+require 'solargraph/yard_tags'
 
 module Solargraph
   # The YardMap provides access to YARD documentation for the Ruby core, the
@@ -14,288 +12,7 @@ module Solargraph
 
     autoload :Cache,       'solargraph/yard_map/cache'
     autoload :Mapper,      'solargraph/yard_map/mapper'
-    autoload :RdocToYard,  'solargraph/yard_map/rdoc_to_yard'
     autoload :Helpers,     'solargraph/yard_map/helpers'
     autoload :ToMethod,    'solargraph/yard_map/to_method'
-
-    include ApiMap::BundlerMethods
-
-    # @return [Boolean]
-    attr_writer :with_dependencies
-
-    # @param required [Array<String>, Set<String>]
-    # @param directory [String]
-    # @param source_gems [Array<String>, Set<String>]
-    # @param with_dependencies [Boolean]
-    def initialize(required: [], directory: '', source_gems: [], with_dependencies: true)
-      @with_dependencies = with_dependencies
-      change required.to_set, directory, source_gems.to_set
-    end
-
-    # @return [Array<Solargraph::Pin::Base>]
-    def pins
-      @pins ||= []
-    end
-
-    def with_dependencies?
-      @with_dependencies ||= true unless @with_dependencies == false
-      @with_dependencies
-    end
-
-    # @param new_requires [Set<String>] Required paths to use for loading gems
-    # @param new_directory [String] The workspace directory
-    # @param new_source_gems [Set<String>] Gems under local development (i.e., part of the workspace)
-    # @return [Boolean]
-    def change new_requires, new_directory, new_source_gems
-      return false if new_requires == base_required && new_directory == @directory && new_source_gems == @source_gems
-      @gem_paths = {}
-      base_required.replace new_requires
-      required.replace new_requires
-      # HACK: Hardcoded YAML handling
-      required.add 'psych' if new_requires.include?('yaml')
-      @source_gems = new_source_gems
-      @directory = new_directory
-      process_requires
-      @rebindable_method_names = nil
-      @pin_class_hash = nil
-      @pin_select_cache = {}
-      pins.each { |p| p.source = :yard }
-      true
-    end
-
-    # @return [Set<String>]
-    def rebindable_method_names
-      @rebindable_method_names ||= pins_by_class(Pin::Method)
-        .select { |pin| pin.comments && pin.comments.include?('@yieldself') }
-        .map(&:name)
-        .concat(['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec', 'define_method'])
-        .to_set
-    end
-
-    # @return [Array<String>]
-    def yardocs
-      @yardocs ||= []
-    end
-
-    # @return [Set<String>]
-    def required
-      @required ||= Set.new
-    end
-
-    # @return [Array<String>]
-    def unresolved_requires
-      @unresolved_requires ||= []
-    end
-
-    # @return [Array<String>]
-    def missing_docs
-      @missing_docs ||= []
-    end
-
-    # @param y [String]
-    # @return [YARD::Registry]
-    def load_yardoc y
-      if y.is_a?(Array)
-        YARD::Registry.load y, true
-      else
-        YARD::Registry.load! y
-      end
-    rescue StandardError => e
-      Solargraph::Logging.logger.warn "Error loading yardoc '#{y}' #{e.class} #{e.message}"
-      yardocs.delete y
-      nil
-    end
-
-    # @param path [String]
-    # @return [Pin::Base]
-    def path_pin path
-      pins.select { |p| p.path == path }.first
-    end
-
-    # Get the location of a file referenced by a require path.
-    #
-    # @param path [String]
-    # @return [Location]
-    def require_reference path
-      # @type [Gem::Specification]
-      spec = spec_for_require(path)
-      spec.full_require_paths.each do |rp|
-        file = File.join(rp, "#{path}.rb")
-        next unless File.file?(file)
-        return Solargraph::Location.new(file, Solargraph::Range.from_to(0, 0, 0, 0))
-      end
-      nil
-    rescue Gem::LoadError
-      nil
-    end
-
-    def base_required
-      @base_required ||= Set.new
-    end
-
-    def directory
-      @directory ||= ''
-    end
-
-    private
-
-    # @return [YardMap::Cache]
-    def cache
-      @cache ||= YardMap::Cache.new
-    end
-
-    # @return [Hash]
-    def pin_class_hash
-      @pin_class_hash ||= pins.to_set.classify(&:class).transform_values(&:to_a)
-    end
-
-    # @return [Array<Pin::Base>]
-    def pins_by_class klass
-      @pin_select_cache[klass] ||= pin_class_hash.select { |key, _| key <= klass }.values.flatten
-    end
-
-    # @param ns [YARD::CodeObjects::NamespaceObject]
-    # @return [Array<YARD::CodeObjects::Base>]
-    def recurse_namespace_object ns
-      result = []
-      ns.children.each do |c|
-        result.push c
-        result.concat recurse_namespace_object(c) if c.respond_to?(:children)
-      end
-      result
-    end
-
-    # @return [void]
-    def process_requires
-      @gemset = process_gemsets
-      required.merge @gemset.keys if required.include?('bundler/require')
-      pins.clear
-      unresolved_requires.clear
-      missing_docs.clear
-      environ = Convention.for_global(self)
-      done = []
-      already_errored = []
-      (required + environ.requires).each do |r|
-        next if r.nil? || r.empty? || done.include?(r)
-        done.push r
-        cached = cache.get_path_pins(r)
-        unless cached.nil?
-          pins.concat cached
-          next
-        end
-        result = pins_for_require r, already_errored
-        result.delete_if(&:nil?)
-        unless result.empty?
-          cache.set_path_pins r, result
-          pins.concat result
-        end
-      end
-      if required.include?('yaml') && required.include?('psych')
-        # HACK: Hardcoded YAML handling
-        # @todo Why can't this be handled with an override or a virtual pin?
-        pin = path_pin('YAML')
-        pin.instance_variable_set(:@return_type, ComplexType.parse('Module<Psych>')) unless pin.nil?
-      end
-      pins.concat environ.pins
-    end
-
-    def process_error(req, result, already_errored, yd = 1)
-      base = req.split('/').first
-      return if already_errored.include?(base)
-      already_errored.push base
-      if yd.nil?
-        missing_docs.push req
-      else
-        unresolved_requires.push req
-      end
-    end
-
-    def process_gemsets
-      return {} if directory.empty? || !File.file?(File.join(directory, 'Gemfile'))
-      require_from_bundle(directory)
-    end
-
-    # @param r [String]
-    def pins_for_require r, already_errored
-      result = []
-      begin
-        name = r.split('/').first.to_s
-        return [] if name.empty? || @source_gems.include?(name) || @gem_paths.key?(name)
-        spec = spec_for_require(name)
-        @gem_paths[name] = spec.full_gem_path
-
-        yd = yardoc_file_for_spec(spec)
-        # YARD detects gems for certain libraries that do not have a yardoc
-        # but exist in the stdlib. `fileutils` is an example. Treat those
-        # cases as errors and check the stdlib yardoc.
-        if yd.nil?
-          process_error(r, result, already_errored, nil)
-          return []
-        end
-        unless yardocs.include?(yd)
-          yardocs.unshift yd
-          result.concat process_yardoc yd, spec
-          if with_dependencies?
-            (spec.dependencies - spec.development_dependencies).each do |dep|
-              result.concat pins_for_require dep.name, already_errored
-            end
-          end
-        end
-      rescue Gem::LoadError, NoYardocError
-        process_error(r, result, already_errored)
-      end
-      return result
-    end
-
-    # @param y [String, nil]
-    # @param spec [Gem::Specification, nil]
-    # @return [Array<Pin::Base>]
-    def process_yardoc y, spec = nil
-      return [] if y.nil?
-      if spec
-        cache = Solargraph::Cache.load('gems', "#{spec.name}-#{spec.version}.ser")
-        return cache if cache
-      end
-      size = Dir.glob(File.join(y, '**', '*'))
-        .map{ |f| File.size(f) }
-        .inject(:+)
-      if !size.nil? && size > 20_000_000
-        Solargraph::Logging.logger.warn "Yardoc at #{y} is too large to process (#{size} bytes)"
-        return []
-      end
-      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from #{y}"
-      load_yardoc y
-      result = Mapper.new(YARD::Registry.all, spec).map
-      raise NoYardocError, "Yardoc at #{y} is empty" if result.empty?
-      if spec
-        Solargraph::Cache.save 'gems', "#{spec.name}-#{spec.version}.ser", result
-      end
-      result
-    end
-
-    # @param spec [Gem::Specification]
-    # @return [String]
-    def yardoc_file_for_spec spec
-      YARD::Registry.yardoc_file_for_gem(spec.name, "= #{spec.version}")
-    end
-
-    # @param path [String]
-    # @return [Gem::Specification]
-    def spec_for_require path
-      name = path.split('/').first.to_s
-      spec = Gem::Specification.find_by_name(name, @gemset[name])
-
-      # Avoid loading the spec again if it's going to be skipped anyway
-      return spec if @source_gems.include?(spec.name)
-      # Avoid loading the spec again if it's already the correct version
-      if @gemset[spec.name] && @gemset[spec.name] != spec.version
-        begin
-          return Gem::Specification.find_by_name(spec.name, "= #{@gemset[spec.name]}")
-        rescue Gem::LoadError
-          Solargraph.logger.warn "Unable to load #{spec.name} #{@gemset[spec.name]} specified by workspace, using #{spec.version} instead"
-        end
-      end
-      spec
-    end
   end
 end

data/lib/solargraph/yard_tags.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'yard'
+
+# Change YARD log IO to avoid sending unexpected messages to STDOUT
+YARD::Logger.instance.io = File.new(File::NULL, 'w')
+
+module Solargraph
+  # A placeholder for the @!domain directive. It doesn't need to do anything
+  # for yardocs. It's only used for Solargraph API maps.
+  class DomainDirective < YARD::Tags::Directive
+    def call; end
+  end
+end
+
+# Define a @type tag for documenting variables
+YARD::Tags::Library.define_tag("Type", :type, :with_types_and_name)
+
+# Define an @!override directive for overriding method tags
+YARD::Tags::Library.define_directive("override", :with_name, Solargraph::DomainDirective)

data/lib/solargraph/yardoc.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+module Solargraph
+  # Methods for caching and loading YARD documentation for gems.
+  #
+  module Yardoc
+    module_function
+
+    # Build and cache a gem's yardoc and return the path. If the cache already
+    # exists, do nothing and return the path.
+    #
+    # @param yard_plugins [Array<String>] The names of YARD plugins to use.
+    # @param gemspec [Gem::Specification]
+    # @return [String] The path to the cached yardoc.
+    def cache(yard_plugins, gemspec)
+      path = PinCache.yardoc_path gemspec
+      return path if cached?(gemspec)
+
+      unless Dir.exist? gemspec.gem_dir
+        # Can happen in at least some (old?) RubyGems versions when we
+        # have a gemspec describing a standard library like bundler.
+        #
+        # https://github.com/apiology/solargraph/actions/runs/17650140201/job/50158676842?pr=10
+        Solargraph.logger.info { "Bad info from gemspec - #{gemspec.gem_dir} does not exist" }
+        return path
+      end
+
+      Solargraph.logger.info "Caching yardoc for #{gemspec.name} #{gemspec.version}"
+      cmd = "yardoc --db #{path} --no-output --plugin solargraph"
+      yard_plugins.each { |plugin| cmd << " --plugin #{plugin}" }
+      Solargraph.logger.debug { "Running: #{cmd}" }
+      # @todo set these up to run in parallel
+      stdout_and_stderr_str, status = Open3.capture2e(current_bundle_env_tweaks, cmd, chdir: gemspec.gem_dir)
+      unless status.success?
+        Solargraph.logger.warn { "YARD failed running #{cmd.inspect} in #{gemspec.gem_dir}" }
+        Solargraph.logger.info stdout_and_stderr_str
+      end
+      path
+    end
+
+    # True if the gem yardoc is cached.
+    #
+    # @param gemspec [Gem::Specification]
+    def cached?(gemspec)
+      yardoc = File.join(PinCache.yardoc_path(gemspec), 'complete')
+      File.exist?(yardoc)
+    end
+
+    # True if another process is currently building the yardoc cache.
+    #
+    # @param gemspec [Gem::Specification]
+    def processing?(gemspec)
+      yardoc = File.join(PinCache.yardoc_path(gemspec), 'processing')
+      File.exist?(yardoc)
+    end
+
+    # Load a gem's yardoc and return its code objects.
+    #
+    # @note This method modifies the global YARD registry.
+    #
+    # @param gemspec [Gem::Specification]
+    # @return [Array<YARD::CodeObjects::Base>]
+    def load!(gemspec)
+      YARD::Registry.load! PinCache.yardoc_path gemspec
+      YARD::Registry.all
+    end
+
+    # If the BUNDLE_GEMFILE environment variable is set, we need to
+    # make sure it's an absolute path, as we'll be changing
+    # directories.
+    #
+    # 'bundle exec' sets an absolute path here, but at least the
+    # overcommit gem does not, breaking on-the-fly documention with a
+    # spawned yardoc command from our current bundle
+    #
+    # @return [Hash{String => String}] a hash of environment variables to override
+    def current_bundle_env_tweaks
+      tweaks = {}
+      if ENV['BUNDLE_GEMFILE'] && !ENV['BUNDLE_GEMFILE'].empty?
+        tweaks['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE'])
+      end
+      tweaks
+    end
+  end
+end

data/lib/solargraph.rb

@@ -1,69 +1,105 @@
-# frozen_string_literal: true
-
-Encoding.default_external = 'UTF-8'
-
-require 'solargraph/version'
-
-# The top-level namespace for the Solargraph code mapping, documentation,
-# static analysis, and language server libraries.
-#
-module Solargraph
-  class InvalidOffsetError         < RangeError;    end
-  class DiagnosticsError           < RuntimeError;  end
-  class FileNotFoundError          < RuntimeError;  end
-  class SourceNotAvailableError    < StandardError; end
-  class ComplexTypeError           < StandardError; end
-  class WorkspaceTooLargeError     < RuntimeError;  end
-  class BundleNotFoundError        < StandardError; end
-  class InvalidRubocopVersionError < RuntimeError;  end
-
-  autoload :Position,         'solargraph/position'
-  autoload :Range,            'solargraph/range'
-  autoload :Location,         'solargraph/location'
-  autoload :Shell,            'solargraph/shell'
-  autoload :Source,           'solargraph/source'
-  autoload :SourceMap,        'solargraph/source_map'
-  autoload :ApiMap,           'solargraph/api_map'
-  autoload :YardMap,          'solargraph/yard_map'
-  autoload :Pin,              'solargraph/pin'
-  autoload :ServerMethods,    'solargraph/server_methods'
-  autoload :LanguageServer,   'solargraph/language_server'
-  autoload :Workspace,        'solargraph/workspace'
-  autoload :Page,             'solargraph/page'
-  autoload :Library,          'solargraph/library'
-  autoload :Diagnostics,      'solargraph/diagnostics'
-  autoload :ComplexType,      'solargraph/complex_type'
-  autoload :Bench,            'solargraph/bench'
-  autoload :Logging,          'solargraph/logging'
-  autoload :TypeChecker,      'solargraph/type_checker'
-  autoload :Environ,          'solargraph/environ'
-  autoload :Convention,       'solargraph/convention'
-  autoload :Documentor,       'solargraph/documentor'
-  autoload :Parser,           'solargraph/parser'
-  autoload :RbsMap,           'solargraph/rbs_map'
-  autoload :Cache,            'solargraph/cache'
-
-  dir = File.dirname(__FILE__)
-  YARD_EXTENSION_FILE = File.join(dir, 'yard-solargraph.rb')
-  VIEWS_PATH = File.join(dir, 'solargraph', 'views')
-
-  # A convenience method for Solargraph::Logging.logger.
-  #
-  # @return [Logger]
-  def self.logger
-    Solargraph::Logging.logger
-  end
-
-  # A helper method that runs Bundler.with_unbundled_env or falls back to
-  # Bundler.with_clean_env for earlier versions of Bundler.
-  #
-  # @return [void]
-  def self.with_clean_env &block
-    meth = if Bundler.respond_to?(:with_original_env)
-      :with_original_env
-    else
-      :with_clean_env
-    end
-    Bundler.send meth, &block
-  end
-end
+# frozen_string_literal: true
+
+Encoding.default_external = 'UTF-8'
+
+require 'bundler'
+require 'set'
+require 'yard-solargraph'
+require 'solargraph/yard_tags'
+require 'solargraph/version'
+
+# The top-level namespace for the Solargraph code mapping, documentation,
+# static analysis, and language server libraries.
+#
+module Solargraph
+  class InvalidOffsetError         < RangeError;    end
+  class DiagnosticsError           < RuntimeError;  end
+  class FileNotFoundError          < RuntimeError;  end
+  class SourceNotAvailableError    < StandardError; end
+  class ComplexTypeError           < StandardError; end
+  class WorkspaceTooLargeError     < RuntimeError;  end
+  class BundleNotFoundError        < StandardError; end
+  class InvalidRubocopVersionError < RuntimeError;  end
+
+  autoload :Position,         'solargraph/position'
+  autoload :Range,            'solargraph/range'
+  autoload :Location,         'solargraph/location'
+  autoload :Shell,            'solargraph/shell'
+  autoload :Source,           'solargraph/source'
+  autoload :SourceMap,        'solargraph/source_map'
+  autoload :ApiMap,           'solargraph/api_map'
+  autoload :Yardoc,           'solargraph/yardoc'
+  autoload :YardMap,          'solargraph/yard_map'
+  autoload :Pin,              'solargraph/pin'
+  autoload :DocMap,           'solargraph/doc_map'
+  autoload :ServerMethods,    'solargraph/server_methods'
+  autoload :LanguageServer,   'solargraph/language_server'
+  autoload :Workspace,        'solargraph/workspace'
+  autoload :Page,             'solargraph/page'
+  autoload :Library,          'solargraph/library'
+  autoload :Diagnostics,      'solargraph/diagnostics'
+  autoload :ComplexType,      'solargraph/complex_type'
+  autoload :Bench,            'solargraph/bench'
+  autoload :Logging,          'solargraph/logging'
+  autoload :TypeChecker,      'solargraph/type_checker'
+  autoload :Environ,          'solargraph/environ'
+  autoload :Equality,         'solargraph/equality'
+  autoload :Convention,       'solargraph/convention'
+  autoload :Parser,           'solargraph/parser'
+  autoload :RbsMap,           'solargraph/rbs_map'
+  autoload :GemPins,          'solargraph/gem_pins'
+  autoload :PinCache,         'solargraph/pin_cache'
+
+  dir = File.dirname(__FILE__)
+  VIEWS_PATH = File.join(dir, 'solargraph', 'views')
+
+  CHDIR_MUTEX = Mutex.new
+
+  # @param type [Symbol] Type of assert.
+  def self.asserts_on?(type)
+    if ENV['SOLARGRAPH_ASSERTS'].nil? || ENV['SOLARGRAPH_ASSERTS'].empty?
+      false
+    elsif ENV['SOLARGRAPH_ASSERTS'] == 'on'
+      true
+    else
+      logger.warn "Unrecognized SOLARGRAPH_ASSERTS value: #{ENV['SOLARGRAPH_ASSERTS']}"
+      false
+    end
+  end
+
+  # @param type [Symbol] The type of assertion to perform.
+  # @param msg [String, nil] An optional message to log
+  # @param block [Proc] A block that returns a message to log
+  # @return [void]
+  def self.assert_or_log(type, msg = nil, &block)
+    raise (msg || block.call) if asserts_on?(type) && ![:combine_with_visibility].include?(type)
+    logger.info msg, &block
+  end
+
+  # A convenience method for Solargraph::Logging.logger.
+  #
+  # @return [Logger]
+  def self.logger
+    Solargraph::Logging.logger
+  end
+
+  # A helper method that runs Bundler.with_unbundled_env or falls back to
+  # Bundler.with_clean_env for earlier versions of Bundler.
+  #
+  # @generic T
+  # @yieldreturn [generic<T>]
+  # @sg-ignore dynamic call, but both functions behave the same
+  # @return [generic<T>]
+  def self.with_clean_env &block
+    meth = if Bundler.respond_to?(:with_original_env)
+      :with_original_env
+    else
+      :with_clean_env
+    end
+    Bundler.send meth, &block
+  end
+end
+
+# Ensure that ParserGem node processors are properly loaded to avoid conflicts
+# with Convention node processors
+require 'solargraph/parser/parser_gem/node_processors'