solargraph 0.51.2 → 0.54.2

data/lib/solargraph.rb

@@ -2,6 +2,9 @@
 
 Encoding.default_external = 'UTF-8'
 
+require 'set'
+require 'yard-solargraph'
+require 'solargraph/yard_tags'
 require 'solargraph/version'
 
 # The top-level namespace for the Solargraph code mapping, documentation,
@@ -24,8 +27,10 @@ module Solargraph
   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'
@@ -38,13 +43,12 @@ module Solargraph
   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 :GemPins,          'solargraph/gem_pins'
   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.
@@ -56,8 +60,6 @@ module Solargraph
 
   # 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

data/solargraph.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.metadata["changelog_uri"]   = "https://github.com/castwide/solargraph/blob/master/CHANGELOG.md"
   s.metadata["source_code_uri"] = "https://github.com/castwide/solargraph"
 
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 3.0'
 
   s.add_runtime_dependency 'backport', '~> 1.2'
-  s.add_runtime_dependency 'benchmark'
+  s.add_runtime_dependency 'benchmark', '~> 0.4'
   s.add_runtime_dependency 'bundler', '~> 2.0'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'
   s.add_runtime_dependency 'jaro_winkler', '~> 1.6'
@@ -34,19 +34,20 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'observer', '~> 0.1'
   s.add_runtime_dependency 'ostruct', '~> 0.6'
   s.add_runtime_dependency 'parser', '~> 3.0'
-  s.add_runtime_dependency 'rbs', '~> 3.0'
-  s.add_runtime_dependency 'reverse_markdown', '>= 2.0', '< 4'
+  s.add_runtime_dependency 'rbs', '~> 3.3'
+  s.add_runtime_dependency 'reverse_markdown', '~> 3.0'
   s.add_runtime_dependency 'rubocop', '~> 1.38'
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'
   s.add_runtime_dependency 'yard', '~> 0.9', '>= 0.9.24'
+  s.add_runtime_dependency 'yard-solargraph', '~> 0.1'
 
-  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry', '~> 0.15'
   s.add_development_dependency 'public_suffix', '~> 3.1'
   s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'simplecov', '~> 0.14'
   s.add_development_dependency 'webmock', '~> 3.6'
   # work around missing yard dependency needed as of Ruby 3.5
-  s.add_development_dependency 'irb'
+  s.add_development_dependency 'irb', '~> 1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.51.2
+  version: 0.54.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-01 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -28,16 +28,16 @@ dependencies:
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,34 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -260,20 +254,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.24
+- !ruby/object:Gem::Dependency
+  name: yard-solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -348,16 +356,16 @@ dependencies:
   name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 description: IDE tools for code completion, inline documentation, and static analysis
 email: admin@castwide.com
 executables:
@@ -366,7 +374,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
+- ".github/workflows/plugins.yml"
 - ".github/workflows/rspec.yml"
+- ".github/workflows/typecheck.yml"
 - ".gitignore"
 - ".rspec"
 - ".yardopts"
@@ -380,7 +390,6 @@ files:
 - lib/.rubocop.yml
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
-- lib/solargraph/api_map/bundler_methods.rb
 - lib/solargraph/api_map/cache.rb
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
@@ -406,13 +415,13 @@ files:
 - lib/solargraph/diagnostics/severities.rb
 - lib/solargraph/diagnostics/type_check.rb
 - lib/solargraph/diagnostics/update_errors.rb
-- lib/solargraph/documentor.rb
+- lib/solargraph/doc_map.rb
 - lib/solargraph/environ.rb
+- lib/solargraph/gem_pins.rb
 - lib/solargraph/language_server.rb
 - lib/solargraph/language_server/completion_item_kinds.rb
 - lib/solargraph/language_server/error_codes.rb
 - lib/solargraph/language_server/host.rb
-- lib/solargraph/language_server/host/cataloger.rb
 - lib/solargraph/language_server/host/diagnoser.rb
 - lib/solargraph/language_server/host/dispatch.rb
 - lib/solargraph/language_server/host/message_worker.rb
@@ -463,6 +472,7 @@ files:
 - lib/solargraph/language_server/message/workspace/did_change_workspace_folders.rb
 - lib/solargraph/language_server/message/workspace/workspace_symbol.rb
 - lib/solargraph/language_server/message_types.rb
+- lib/solargraph/language_server/progress.rb
 - lib/solargraph/language_server/request.rb
 - lib/solargraph/language_server/symbol_kinds.rb
 - lib/solargraph/language_server/transport.rb
@@ -475,65 +485,40 @@ files:
 - lib/solargraph/page.rb
 - lib/solargraph/parser.rb
 - lib/solargraph/parser/comment_ripper.rb
-- lib/solargraph/parser/legacy.rb
-- lib/solargraph/parser/legacy/class_methods.rb
-- lib/solargraph/parser/legacy/flawed_builder.rb
-- lib/solargraph/parser/legacy/node_chainer.rb
-- lib/solargraph/parser/legacy/node_methods.rb
-- lib/solargraph/parser/legacy/node_processors.rb
-- lib/solargraph/parser/legacy/node_processors/alias_node.rb
-- lib/solargraph/parser/legacy/node_processors/args_node.rb
-- lib/solargraph/parser/legacy/node_processors/begin_node.rb
-- lib/solargraph/parser/legacy/node_processors/block_node.rb
-- lib/solargraph/parser/legacy/node_processors/casgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/cvasgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/def_node.rb
-- lib/solargraph/parser/legacy/node_processors/defs_node.rb
-- lib/solargraph/parser/legacy/node_processors/gvasgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/ivasgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/lvasgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/namespace_node.rb
-- lib/solargraph/parser/legacy/node_processors/orasgn_node.rb
-- lib/solargraph/parser/legacy/node_processors/resbody_node.rb
-- lib/solargraph/parser/legacy/node_processors/sclass_node.rb
-- lib/solargraph/parser/legacy/node_processors/send_node.rb
-- lib/solargraph/parser/legacy/node_processors/sym_node.rb
 - lib/solargraph/parser/node_methods.rb
 - lib/solargraph/parser/node_processor.rb
 - lib/solargraph/parser/node_processor/base.rb
+- lib/solargraph/parser/parser_gem.rb
+- lib/solargraph/parser/parser_gem/class_methods.rb
+- lib/solargraph/parser/parser_gem/flawed_builder.rb
+- lib/solargraph/parser/parser_gem/node_chainer.rb
+- lib/solargraph/parser/parser_gem/node_methods.rb
+- lib/solargraph/parser/parser_gem/node_processors.rb
+- lib/solargraph/parser/parser_gem/node_processors/alias_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/args_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/begin_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/block_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/casgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/cvasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/def_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/defs_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/gvasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/ivasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/lvasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/masgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/namespace_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/orasgn_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/resbody_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/sclass_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/send_node.rb
+- lib/solargraph/parser/parser_gem/node_processors/sym_node.rb
 - lib/solargraph/parser/region.rb
-- lib/solargraph/parser/rubyvm.rb
-- lib/solargraph/parser/rubyvm/class_methods.rb
-- lib/solargraph/parser/rubyvm/node_chainer.rb
-- lib/solargraph/parser/rubyvm/node_methods.rb
-- lib/solargraph/parser/rubyvm/node_processors.rb
-- lib/solargraph/parser/rubyvm/node_processors/alias_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/args_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/begin_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/block_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/casgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/cvasgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/def_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/defs_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/gvasgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/ivasgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/kw_arg_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/lit_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/lvasgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/namespace_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/opt_arg_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/orasgn_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/resbody_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/sclass_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/scope_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/send_node.rb
-- lib/solargraph/parser/rubyvm/node_processors/sym_node.rb
-- lib/solargraph/parser/rubyvm/node_wrapper.rb
 - lib/solargraph/parser/snippet.rb
 - lib/solargraph/pin.rb
 - lib/solargraph/pin/base.rb
 - lib/solargraph/pin/base_variable.rb
 - lib/solargraph/pin/block.rb
+- lib/solargraph/pin/callable.rb
 - lib/solargraph/pin/class_variable.rb
 - lib/solargraph/pin/closure.rb
 - lib/solargraph/pin/common.rb
@@ -569,12 +554,13 @@ files:
 - lib/solargraph/rbs_map/conversions.rb
 - lib/solargraph/rbs_map/core_fills.rb
 - lib/solargraph/rbs_map/core_map.rb
-- lib/solargraph/rbs_map/core_signs.rb
 - lib/solargraph/rbs_map/stdlib_map.rb
 - lib/solargraph/server_methods.rb
 - lib/solargraph/shell.rb
 - lib/solargraph/source.rb
 - lib/solargraph/source/chain.rb
+- lib/solargraph/source/chain/array.rb
+- lib/solargraph/source/chain/block_symbol.rb
 - lib/solargraph/source/chain/block_variable.rb
 - lib/solargraph/source/chain/call.rb
 - lib/solargraph/source/chain/class_variable.rb
@@ -582,6 +568,7 @@ files:
 - lib/solargraph/source/chain/global_variable.rb
 - lib/solargraph/source/chain/hash.rb
 - lib/solargraph/source/chain/head.rb
+- lib/solargraph/source/chain/if.rb
 - lib/solargraph/source/chain/instance_variable.rb
 - lib/solargraph/source/chain/link.rb
 - lib/solargraph/source/chain/literal.rb
@@ -597,6 +584,7 @@ files:
 - lib/solargraph/source_map.rb
 - lib/solargraph/source_map/clip.rb
 - lib/solargraph/source_map/completion.rb
+- lib/solargraph/source_map/data.rb
 - lib/solargraph/source_map/mapper.rb
 - lib/solargraph/type_checker.rb
 - lib/solargraph/type_checker/checks.rb
@@ -621,7 +609,8 @@ files:
 - lib/solargraph/yard_map/mapper/to_method.rb
 - lib/solargraph/yard_map/mapper/to_namespace.rb
 - lib/solargraph/yard_map/to_method.rb
-- lib/yard-solargraph.rb
+- lib/solargraph/yard_tags.rb
+- lib/solargraph/yardoc.rb
 - solargraph.gemspec
 homepage: https://solargraph.org
 licenses:
@@ -639,7 +628,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/solargraph/api_map/bundler_methods.rb

@@ -1,22 +0,0 @@
-require 'bundler'
-require 'shellwords'
-
-module Solargraph
-  class ApiMap
-    module BundlerMethods
-      module_function
-
-      # @param directory [String]
-      # @return [Hash]
-      def require_from_bundle directory
-        begin
-          Solargraph.logger.info "Loading gems for bundler/require"
-          Documentor.specs_from_bundle(directory)
-        rescue BundleNotFoundError => e
-          Solargraph.logger.warn e.message
-          {}
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/documentor.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler'
-require 'json'
-require 'open3'
-require 'shellwords'
-require 'yard'
-require 'fileutils'
-
-module Solargraph
-  class Documentor
-    RDOC_GEMS = %w[
-      actioncable actionmailbox actionmailer actionpack actiontext actionview
-      activejob activemodel activerecord activestorage activesupport railties
-    ]
-
-    def initialize directory, rebuild: false, out: File.new(File::NULL, 'w')
-      @directory = directory
-      @rebuild = rebuild
-      @out = out
-    end
-
-    # @return [Boolean] True if all specs were found and documented.
-    def document
-      failures = 0
-      Documentor.specs_from_bundle(@directory).each_pair do |name, version|
-        yd = YARD::Registry.yardoc_file_for_gem(name, "= #{version}")
-        if !yd || @rebuild
-          FileUtils.safe_unlink File.join(YardMap::CoreDocs.cache_dir, 'gems', "#{name}-#{version}.ser")
-          @out.puts "Documenting #{name} #{version}"
-          `yard gems #{name} #{version} #{@rebuild ? '--rebuild' : ''}`
-          yd = YARD::Registry.yardoc_file_for_gem(name, "= #{version}")
-          # HACK: Ignore errors documenting bundler
-          if !yd && name != 'bundler'
-            @out.puts "#{name} #{version} YARD documentation failed"
-            failures += 1
-          end
-        end
-        if yd && RDOC_GEMS.include?(name)
-          cache = File.join(Solargraph::YardMap::CoreDocs.cache_dir, 'gems', "#{name}-#{version}", 'yardoc')
-          if !File.exist?(cache) || @rebuild
-            @out.puts "Caching custom documentation for #{name} #{version}"
-            spec = Gem::Specification.find_by_name(name, "= #{version}")
-            Solargraph::YardMap::RdocToYard.run(spec)
-          end
-        end
-      end
-      if failures > 0
-        @out.puts "#{failures} gem#{failures == 1 ? '' : 's'} could not be documented. You might need to run `bundle install`."
-      end
-      failures == 0
-    rescue Solargraph::BundleNotFoundError => e
-      @out.puts "[#{e.class}] #{e.message}"
-      @out.puts "No bundled gems are available in #{@directory}"
-      false
-    end
-
-    # @param directory [String]
-    # @return [Hash]
-    def self.specs_from_bundle directory
-      Solargraph.with_clean_env do
-        cmd = [
-          'ruby', '-e',
-          "require 'bundler'; require 'json'; Dir.chdir('#{directory}') { puts Bundler.definition.specs_for([:default]).map { |spec| [spec.name, spec.version] }.to_h.to_json }"
-        ]
-        o, e, s = Open3.capture3(*cmd)
-        if s.success?
-          o && !o.empty? ? JSON.parse(o.split("\n").last) : {}
-        else
-          Solargraph.logger.warn e
-          raise BundleNotFoundError, "Failed to load gems from bundle at #{directory}"
-        end
-      end
-    end
-  end
-end

data/lib/solargraph/language_server/host/cataloger.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module LanguageServer
-    class Host
-      # An asynchronous library cataloging handler.
-      #
-      class Cataloger
-        def initialize host
-          @host = host
-          @stopped = true
-        end
-
-        # Stop the catalog thread.
-        #
-        # @return [void]
-        def stop
-          @stopped = true
-        end
-
-        # True if the cataloger is stopped.
-        #
-        # @return [Boolean]
-        def stopped?
-          @stopped
-        end
-
-        # Start the catalog thread.
-        #
-        # @return [void]
-        def start
-          return unless stopped?
-          @stopped = false
-          Thread.new do
-            until stopped?
-              tick
-              sleep 0.1
-            end
-          end
-        end
-
-        # Perform cataloging.
-        #
-        # @return [void]
-        def tick
-          host.catalog
-        end
-
-        private
-
-        # @return [Host]
-        attr_reader :host
-      end
-    end
-  end
-end