solargraph 0.59.0.dev.1 → 0.59.0.dev.2

data/lib/solargraph/workspace.rb

@@ -80,14 +80,6 @@ module Solargraph
       @pin_cache ||= fresh_pincache
     end
 
-    # @param stdlib_name [String]
-    #
-    # @return [Array<String>]
-    def stdlib_dependencies stdlib_name
-      deps = RbsMap::StdlibMap.stdlib_dependencies(stdlib_name, nil) || []
-      deps.map { |dep| dep['name'] }.compact
-    end
-
     # @return [Environ]
     def global_environ
       # empty docmap, since the result needs to work in any possible
@@ -127,7 +119,7 @@ module Solargraph
 
     # @param level [Symbol]
     # @return [TypeChecker::Rules]
-    def rules(level)
+    def rules level
       @rules ||= TypeChecker::Rules.new(level, config.type_checker_rules)
     end
 
@@ -147,7 +139,7 @@ module Solargraph
       includes_any = false
       sources.each do |source|
         # @sg-ignore Need to add nil check here
-        next unless directory == "*" || config.calculated.include?(source.filename)
+        next unless directory == '*' || config.calculated.include?(source.filename)
 
         # @sg-ignore Need to add nil check here
         source_hash[source.filename] = source
@@ -199,7 +191,7 @@ module Solargraph
     def would_require? path
       require_paths.each do |rp|
         full = File.join rp, path
-        return true if File.file?(full) || File.file?(full << ".rb")
+        return true if File.file?(full) || File.file?(full << '.rb')
       end
       false
     end
@@ -223,17 +215,15 @@ module Solargraph
 
     # @return [String, nil]
     def rbs_collection_path
-      @gem_rbs_collection ||= read_rbs_collection_path
+      @rbs_collection_path ||= read_rbs_collection_path
     end
 
     # @return [String, nil]
     def rbs_collection_config_path
       @rbs_collection_config_path ||=
-        begin
-          unless directory.empty? || directory == '*'
-            yaml_file = File.join(directory, 'rbs_collection.yaml')
-            yaml_file if File.file?(yaml_file)
-          end
+        unless directory.empty? || directory == '*'
+          yaml_file = File.join(directory, 'rbs_collection.yaml')
+          yaml_file if File.file?(yaml_file)
         end
     end
 
@@ -251,14 +241,6 @@ module Solargraph
       gemspecs.all_gemspecs_from_bundle
     end
 
-    # @todo make this actually work against bundle instead of pulling
-    #   all installed gemspecs -
-    #   https://github.com/apiology/solargraph/pull/10
-    # @return [Array<Gem::Specification>]
-    def all_gemspecs_from_bundle
-      Gem::Specification.to_a
-    end
-
     # @param out [StringIO, IO, nil] output stream for logging
     # @param rebuild [Boolean] whether to rebuild the pins even if they are cached
     # @return [void]
@@ -278,7 +260,7 @@ module Solargraph
       # which are likely to be newer and have more pins
       pin_cache.cache_all_stdlibs(out: out, rebuild: rebuild)
 
-      out&.puts "Documentation cached for core, standard library and gems."
+      out&.puts 'Documentation cached for core, standard library and gems.'
     end
 
     # Synchronize the workspace from the provided updater.
@@ -323,30 +305,25 @@ module Solargraph
     # @return [void]
     def load_sources
       source_hash.clear
-      unless directory.empty? || directory == '*'
-        size = config.calculated.length
-        if config.max_files > 0 and size > config.max_files
-          raise WorkspaceTooLargeError,
-                "The workspace is too large to index (#{size} files, #{config.max_files} max)"
-        end
-        config.calculated.each do |filename|
-          begin
-            source_hash[filename] = Solargraph::Source.load(filename)
-          rescue Errno::ENOENT => e
-            Solargraph.logger.warn("Error loading #{filename}: [#{e.class}] #{e.message}")
-          end
-        end
+      return if directory.empty? || directory == '*'
+      size = config.calculated.length
+      if config.max_files.positive? && (size > config.max_files)
+        raise WorkspaceTooLargeError,
+              "The workspace is too large to index (#{size} files, #{config.max_files} max)"
+      end
+      config.calculated.each do |filename|
+        source_hash[filename] = Solargraph::Source.load(filename)
+      rescue Errno::ENOENT => e
+        Solargraph.logger.warn("Error loading #{filename}: [#{e.class}] #{e.message}")
       end
     end
 
     # @return [void]
     def require_plugins
       config.plugins.each do |plugin|
-        begin
-          require plugin
-        rescue LoadError
-          Solargraph.logger.warn "Failed to load plugin '#{plugin}'"
-        end
+        require plugin
+      rescue LoadError
+        Solargraph.logger.warn "Failed to load plugin '#{plugin}'"
       end
     end
 

data/lib/solargraph/yard_map/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   class YardMap
     module Helpers
@@ -22,10 +24,12 @@ module Solargraph
       # @param code_object [YARD::CodeObjects::Base]
       # @param spec [Gem::Specification, nil]
       # @return [Solargraph::Pin::Namespace]
-      def create_closure_namespace_for(code_object, spec)
+      def create_closure_namespace_for code_object, spec
         code_object_for_location = code_object
         # code_object.namespace is sometimes a YARD proxy object pointing to a method path ("Object#new")
-        code_object_for_location = code_object.namespace if code_object.namespace.is_a?(YARD::CodeObjects::NamespaceObject)
+        if code_object.namespace.is_a?(YARD::CodeObjects::NamespaceObject)
+          code_object_for_location = code_object.namespace
+        end
         namespace_location = object_location(code_object_for_location, spec)
         ns_name = code_object.namespace.to_s
         if ns_name.empty?

data/lib/solargraph/yard_map/mapper/to_method.rb

@@ -9,8 +9,8 @@ module Solargraph
         # @type [Hash{Array<String, Symbol, String> => Symbol}]
         VISIBILITY_OVERRIDE = {
           # YARD pays attention to 'private' statements prior to class methods but shouldn't
-          ["Rails::Engine", :class, "find_root_with_flag"] => :public
-        }
+          ['Rails::Engine', :class, 'find_root_with_flag'] => :public
+        }.freeze
 
         # @param code_object [YARD::CodeObjects::MethodObject]
         # @param name [String, nil]
@@ -32,7 +32,9 @@ module Solargraph
           # @sg-ignore Need to add nil check here
           final_visibility ||= VISIBILITY_OVERRIDE[[closure.path, final_scope]]
           # @sg-ignore Need to add nil check here
-          final_visibility ||= :private if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name.to_sym)
+          if closure.path == 'Kernel' && Kernel.private_instance_methods(false).include?(name.to_sym)
+            final_visibility ||= :private
+          end
           final_visibility ||= visibility
           final_visibility ||= :private if code_object.module_function? && final_scope == :instance
           final_visibility ||= :public if code_object.module_function? && final_scope == :class
@@ -50,7 +52,7 @@ module Solargraph
               explicit: code_object.is_explicit?,
               return_type: return_type,
               parameters: [],
-              source: :yardoc,
+              source: :yardoc
             )
           else
             # @sg-ignore Need to add nil check here
@@ -66,7 +68,7 @@ module Solargraph
               return_type: return_type,
               attribute: code_object.is_attribute?,
               parameters: [],
-              source: :yardoc,
+              source: :yardoc
             )
             pin.parameters.concat get_parameters(code_object, location, comments, pin)
             pin.parameters.freeze
@@ -99,7 +101,7 @@ module Solargraph
                 presence: nil,
                 decl: arg_type(a),
                 asgn_code: a[1],
-                source: :yardoc,
+                source: :yardoc
               )
             end
           end

data/lib/solargraph/yard_map/mapper/to_namespace.rb

@@ -23,7 +23,7 @@ module Solargraph
             closure: closure,
             # @sg-ignore need to add a nil check here
             gates: closure.gates,
-            source: :yardoc,
+            source: :yardoc
           )
         end
       end

data/lib/solargraph/yard_map/mapper.rb

@@ -35,28 +35,27 @@ module Solargraph
       # @return [Array<Pin::Base>]
       def generate_pins code_object
         result = []
-        if code_object.is_a?(YARD::CodeObjects::NamespaceObject)
+        case code_object
+        when YARD::CodeObjects::NamespaceObject
           nspin = ToNamespace.make(code_object, @spec, @namespace_pins[code_object.namespace.to_s])
           @namespace_pins[code_object.path] = nspin
           result.push nspin
-          # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
-          if code_object.is_a?(YARD::CodeObjects::ClassObject) and !code_object.superclass.nil?
+          if code_object.is_a?(YARD::CodeObjects::ClassObject) && !code_object.superclass.nil?
             # This method of superclass detection is a bit of a hack. If
             # the superclass is a Proxy, it is assumed to be undefined in its
             # yardoc and converted to a fully qualified namespace.
-            # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
             superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
-              # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
-              "::#{code_object.superclass}"
-            else
-              # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
-              code_object.superclass.to_s
-            end
+                           "::#{code_object.superclass}"
+                         else
+                           code_object.superclass.to_s
+                         end
             result.push Solargraph::Pin::Reference::Superclass.new(name: superclass, closure: nspin, source: :yard_map)
           end
+          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
           code_object.class_mixins.each do |m|
             result.push Solargraph::Pin::Reference::Extend.new(closure: nspin, name: m.path, source: :yard_map)
           end
+          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
           code_object.instance_mixins.each do |m|
             result.push Solargraph::Pin::Reference::Include.new(
               closure: nspin, # @todo Fix this
@@ -64,8 +63,9 @@ module Solargraph
               source: :yard_map
             )
           end
-        elsif code_object.is_a?(YARD::CodeObjects::MethodObject)
+        when YARD::CodeObjects::MethodObject
           closure = @namespace_pins[code_object.namespace.to_s]
+          # @sg-ignore flow sensitive typing ought to be able to handle 'when ClassName'
           if code_object.name == :initialize && code_object.scope == :instance
             # @todo Check the visibility of <Class>.new
             result.push ToMethod.make(code_object, 'new', :class, :public, closure, @spec)
@@ -73,7 +73,7 @@ module Solargraph
           else
             result.push ToMethod.make(code_object, nil, nil, nil, closure, @spec)
           end
-        elsif code_object.is_a?(YARD::CodeObjects::ConstantObject)
+        when YARD::CodeObjects::ConstantObject
           closure = @namespace_pins[code_object.namespace]
           result.push ToConstant.make(code_object, closure, @spec)
         end

data/lib/solargraph/yard_tags.rb

@@ -1,20 +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)
+# 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.rb

@@ -71,7 +71,7 @@ module Solargraph
   # @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)
+  def self.assert_or_log type, msg = nil, &block
     if asserts_on?
       # @type [String, nil]
       msg ||= block.call
@@ -113,10 +113,10 @@ module Solargraph
   # @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
+             :with_original_env
+           else
+             :with_clean_env
+           end
     Bundler.send meth, &block
   end
 end

data/solargraph.gemspec

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # @sg-ignore Should better support meaning of '&' in RBS
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
 require 'solargraph/version'
 require 'date'
 
@@ -7,12 +9,11 @@ require 'date'
 Gem::Specification.new do |s|
   s.name        = 'solargraph'
   s.version     = Solargraph::VERSION
-  s.date        = Date.today.strftime("%Y-%m-%d")
-  s.summary     = "A Ruby language server"
-  s.description = "IDE tools for code completion, inline documentation, and static analysis"
-  s.authors     = ["Fred Snyder"]
+  s.summary     = 'A Ruby language server'
+  s.description = 'IDE tools for code completion, inline documentation, and static analysis'
+  s.authors     = ['Fred Snyder']
   s.email       = 'admin@castwide.com'
-  s.files       = Dir.chdir(File.expand_path('..', __FILE__)) do
+  s.files       = Dir.chdir(File.expand_path(__dir__)) do
     # @sg-ignore Need backtick support
     # @type [String]
     all_files = `git ls-files -z`
@@ -21,36 +22,36 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://solargraph.org'
   s.license     = 'MIT'
   s.executables = ['solargraph']
-  s.metadata["funding_uri"]     = "https://www.patreon.com/castwide"
-  s.metadata["bug_tracker_uri"] = "https://github.com/castwide/solargraph/issues"
-  s.metadata["changelog_uri"]   = "https://github.com/castwide/solargraph/blob/master/CHANGELOG.md"
-  s.metadata["source_code_uri"] = "https://github.com/castwide/solargraph"
-  s.metadata["rubygems_mfa_required"] = "true"
+  s.metadata['funding_uri']     = 'https://www.patreon.com/castwide'
+  s.metadata['bug_tracker_uri'] = 'https://github.com/castwide/solargraph/issues'
+  s.metadata['changelog_uri']   = 'https://github.com/castwide/solargraph/blob/master/CHANGELOG.md'
+  s.metadata['source_code_uri'] = 'https://github.com/castwide/solargraph'
+  s.metadata['rubygems_mfa_required'] = 'true'
 
   s.required_ruby_version = '>= 3.0'
 
-  s.add_runtime_dependency 'ast', '~> 2.4.3'
-  s.add_runtime_dependency 'backport', '~> 1.2'
-  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', '>= 1.6.1'
-  s.add_runtime_dependency 'kramdown', '~> 2.3'
-  s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
-  s.add_runtime_dependency 'logger', '~> 1.6'
-  s.add_runtime_dependency 'observer', '~> 0.1'
-  s.add_runtime_dependency 'ostruct', '~> 0.6'
-  s.add_runtime_dependency 'open3', '~> 0.2.1'
-  s.add_runtime_dependency 'parser', '~> 3.0'
-  s.add_runtime_dependency 'prism', '~> 1.4'
-  s.add_runtime_dependency 'rbs', ['>= 3.6.1', '<= 4.0.0.dev.5']
-  s.add_runtime_dependency 'reverse_markdown', '~> 3.0'
-  s.add_runtime_dependency 'rubocop', '~> 1.76'
-  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_runtime_dependency 'yard-activesupport-concern', '~> 0.0'
+  s.add_dependency 'ast', '~> 2.4.3'
+  s.add_dependency 'backport', '~> 1.2'
+  s.add_dependency 'benchmark', '~> 0.4'
+  s.add_dependency 'bundler', '>= 2.0'
+  s.add_dependency 'diff-lcs', '~> 1.4'
+  s.add_dependency 'jaro_winkler', '~> 1.6', '>= 1.6.1'
+  s.add_dependency 'kramdown', '~> 2.3'
+  s.add_dependency 'kramdown-parser-gfm', '~> 1.1'
+  s.add_dependency 'logger', '~> 1.6'
+  s.add_dependency 'observer', '~> 0.1'
+  s.add_dependency 'open3', '~> 0.2.1'
+  s.add_dependency 'ostruct', '~> 0.6'
+  s.add_dependency 'parser', '~> 3.0'
+  s.add_dependency 'prism', '~> 1.4'
+  s.add_dependency 'rbs', ['>= 3.6.1', '<= 4.0.0.dev.5']
+  s.add_dependency 'reverse_markdown', '~> 3.0'
+  s.add_dependency 'rubocop', '~> 1.76'
+  s.add_dependency 'thor', '~> 1.0'
+  s.add_dependency 'tilt', '~> 2.0'
+  s.add_dependency 'yard', '~> 0.9', '>= 0.9.24'
+  s.add_dependency 'yard-activesupport-concern', '~> 0.0'
+  s.add_dependency 'yard-solargraph', '~> 0.1'
 
   s.add_development_dependency 'pry', '~> 0.15'
   s.add_development_dependency 'public_suffix', '~> 3.1'
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
   #
   # even more specific on RuboCop itself, which is written into _todo
   # file.
+  s.add_development_dependency 'overcommit', '~> 0.68.0'
   s.add_development_dependency 'rubocop', '~> 1.80.0.0'
   s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
   s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
@@ -69,7 +71,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.21'
   s.add_development_dependency 'simplecov-lcov', '~> 0.8'
   s.add_development_dependency 'undercover', '~> 0.7'
-  s.add_development_dependency 'overcommit', '~> 0.68.0'
   s.add_development_dependency 'webmock', '~> 3.6'
   # work around missing yard dependency needed as of Ruby 3.5
   s.add_development_dependency 'irb', '~> 1.15'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.59.0.dev.1
+  version: 0.59.0.dev.2
 platform: ruby
 authors:
 - Fred Snyder
 bindir: bin
 cert_chain: []
-date: 2026-01-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -156,33 +156,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: open3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: open3
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -308,33 +308,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.24
 - !ruby/object:Gem::Dependency
-  name: yard-solargraph
+  name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: yard-activesupport-concern
+  name: yard-solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -391,6 +391,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.68.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.68.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -489,20 +503,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.68.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.68.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement