solargraph 0.48.0 → 0.50.0

data/lib/solargraph/workspace.rb

@@ -46,24 +46,21 @@ module Solargraph
     #
     # @param source [Solargraph::Source]
     # @return [Boolean] True if the source was added to the workspace
-    def merge source
-      unless directory == '*' || source_hash.key?(source.filename)
+    def merge *sources
+      unless directory == '*' || sources.all? { |source| source_hash.key?(source.filename) }
         # Reload the config to determine if a new source should be included
         @config = Solargraph::Workspace::Config.new(directory)
-        return false unless config.calculated.include?(source.filename)
       end
-      source_hash[source.filename] = source
-      true
-    end
 
-    # Determine whether a file would be merged into the workspace.
-    #
-    # @param filename [String]
-    # @return [Boolean]
-    def would_merge? filename
-      return true if directory == '*' || source_hash.include?(filename)
-      @config = Solargraph::Workspace::Config.new(directory)
-      config.calculated.include?(filename)
+      includes_any = false
+      sources.each do |source|
+        if directory == "*" || config.calculated.include?(source.filename)
+          source_hash[source.filename] = source
+          includes_any = true
+        end
+      end
+
+      includes_any
     end
 
     # Remove a source from the workspace. The source will not be removed if

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

@@ -13,16 +13,19 @@ module Solargraph
           )
           location = object_location(code_object, spec)
           comments = code_object.docstring ? code_object.docstring.all.to_s : ''
-          Pin::Method.new(
+          pin = Pin::Method.new(
             location: location,
             closure: closure,
             name: name || code_object.name.to_s,
             comments: comments,
             scope: scope || code_object.scope,
             visibility: visibility || code_object.visibility,
-            parameters: get_parameters(code_object, location, comments),
+            # @todo Might need to convert overloads to signatures
+            parameters: [],
             explicit: code_object.is_explicit?
           )
+          pin.parameters.concat get_parameters(code_object, location, comments, pin)
+          pin
         end
 
         class << self
@@ -30,7 +33,7 @@ module Solargraph
 
           # @param code_object [YARD::CodeObjects::Base]
           # @return [Array<Solargraph::Pin::Parameter>]
-          def get_parameters code_object, location, comments
+          def get_parameters code_object, location, comments, pin
             return [] unless code_object.is_a?(YARD::CodeObjects::MethodObject)
             # HACK: Skip `nil` and `self` parameters that are sometimes emitted
             # for methods defined in C
@@ -38,7 +41,7 @@ module Solargraph
             code_object.parameters.select { |a| a[0] && a[0] != 'self' }.map do |a|
               Solargraph::Pin::Parameter.new(
                 location: location,
-                closure: self,
+                closure: pin,
                 comments: comments,
                 name: arg_name(a),
                 presence: nil,

data/lib/solargraph/yard_map.rb

@@ -13,34 +13,13 @@ module Solargraph
     class NoYardocError < StandardError; end
 
     autoload :Cache,       'solargraph/yard_map/cache'
-    autoload :CoreDocs,    'solargraph/yard_map/core_docs'
-    autoload :CoreGen,     'solargraph/yard_map/core_gen'
     autoload :Mapper,      'solargraph/yard_map/mapper'
     autoload :RdocToYard,  'solargraph/yard_map/rdoc_to_yard'
-    autoload :CoreFills,   'solargraph/yard_map/core_fills'
-    autoload :StdlibFills, 'solargraph/yard_map/stdlib_fills'
     autoload :Helpers,     'solargraph/yard_map/helpers'
     autoload :ToMethod,    'solargraph/yard_map/to_method'
 
     include ApiMap::BundlerMethods
 
-    CoreDocs.require_minimum
-
-    def stdlib_paths
-      @@stdlib_paths ||= begin
-        result = {}
-        YARD::Registry.load! CoreDocs.yardoc_stdlib_file
-        YARD::Registry.all.each do |co|
-          next if co.file.nil?
-          path = co.file.sub(/^(ext|lib)\//, '').sub(/\.(rb|c)$/, '')
-          base = path.split('/').first
-          result[base] ||= []
-          result[base].push co
-        end
-        result
-      end
-    end
-
     # @return [Boolean]
     attr_writer :with_dependencies
 
@@ -80,6 +59,7 @@ module Solargraph
       @rebindable_method_names = nil
       @pin_class_hash = nil
       @pin_select_cache = {}
+      pins.each { |p| p.source = :yard }
       true
     end
 
@@ -126,12 +106,6 @@ module Solargraph
       nil
     end
 
-    # @return [Array<Solargraph::Pin::Base>]
-    def core_pins
-      # Using a class variable to reduce loads
-      @@core_pins ||= load_core_pins
-    end
-
     # @param path [String]
     # @return [Pin::Base]
     def path_pin path
@@ -155,10 +129,6 @@ module Solargraph
       nil
     end
 
-    def stdlib_pins
-      @stdlib_pins ||= []
-    end
-
     def base_required
       @base_required ||= Set.new
     end
@@ -199,10 +169,9 @@ module Solargraph
     def process_requires
       @gemset = process_gemsets
       required.merge @gemset.keys if required.include?('bundler/require')
-      pins.replace core_pins
+      pins.clear
       unresolved_requires.clear
       missing_docs.clear
-      stdlib_pins.clear
       environ = Convention.for_global(self)
       done = []
       already_errored = []
@@ -234,14 +203,10 @@ module Solargraph
       base = req.split('/').first
       return if already_errored.include?(base)
       already_errored.push base
-      stdtmp = load_stdlib_pins(base)
       if yd.nil?
         missing_docs.push req
-      elsif stdtmp.empty?
-        unresolved_requires.push req
       else
-        stdlib_pins.concat stdtmp
-        result.concat stdtmp
+        unresolved_requires.push req
       end
     end
 
@@ -254,8 +219,8 @@ module Solargraph
     def pins_for_require r, already_errored
       result = []
       begin
-        name = r.split('/').first
-        return [] if @source_gems.include?(name) || @gem_paths.key?(name)
+        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
 
@@ -288,22 +253,8 @@ module Solargraph
     def process_yardoc y, spec = nil
       return [] if y.nil?
       if spec
-        ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
-        if File.file?(ser)
-          Solargraph.logger.info "Loading #{spec.name} #{spec.version} from cache"
-          file = File.open(ser, 'rb')
-          dump = file.read
-          file.close
-          begin
-            result = Marshal.load(dump)
-            return result unless result.nil? || result.empty?
-            Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
-            File.unlink ser
-          rescue StandardError => e
-            Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
-            File.unlink ser
-          end
-        end
+        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) }
@@ -317,10 +268,7 @@ module Solargraph
       result = Mapper.new(YARD::Registry.all, spec).map
       raise NoYardocError, "Yardoc at #{y} is empty" if result.empty?
       if spec
-        ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
-        file = File.open(ser, 'wb')
-        file.write Marshal.dump(result)
-        file.close
+        Solargraph::Cache.save 'gems', "#{spec.name}-#{spec.version}.ser", result
       end
       result
     end
@@ -328,19 +276,13 @@ module Solargraph
     # @param spec [Gem::Specification]
     # @return [String]
     def yardoc_file_for_spec spec
-      cache_dir = File.join(Solargraph::YardMap::CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}", 'yardoc')
-      if File.exist?(cache_dir)
-        Solargraph.logger.info "Using cached documentation for #{spec.name} at #{cache_dir}"
-        cache_dir
-      else
-        YARD::Registry.yardoc_file_for_gem(spec.name, "= #{spec.version}")
-      end
+      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
+      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
@@ -355,88 +297,5 @@ module Solargraph
       end
       spec
     end
-
-    def load_core_pins
-      yd = CoreDocs.yardoc_file
-      ser = File.join(File.dirname(yd), 'core.ser')
-      result = if File.file?(ser)
-        file = File.open(ser, 'rb')
-        dump = file.read
-        file.close
-        begin
-          Marshal.load(dump)
-        rescue StandardError => e
-          Solargraph.logger.warn "Error loading core pin cache: [#{e.class}] #{e.message}"
-          File.unlink ser
-          read_core_and_save_cache(yd, ser)
-        end
-      else
-        read_core_and_save_cache(yd, ser)
-      end
-      ApiMap::Store.new(result + CoreFills::ALL).pins.reject { |pin| pin.is_a?(Pin::Reference::Override) }
-    end
-
-    def read_core_and_save_cache yd, ser
-      result = []
-      load_yardoc yd
-      result.concat Mapper.new(YARD::Registry.all).map
-      # HACK: Assume core methods with a single `args` parameter accept restarg
-      result.select { |pin| pin.is_a?(Solargraph::Pin::Method )}.each do |pin|
-        if pin.parameters.length == 1 && pin.parameters.first.name == 'args' && pin.parameters.first.decl == :arg
-          # @todo Smelly instance variable access
-          pin.parameters.first.instance_variable_set(:@decl, :restarg)
-        end
-      end
-      # HACK: Set missing parameters on `==` methods, e.g., `Symbol#==`
-      result.select { |pin| pin.name == '==' && pin.parameters.empty? }.each do |pin|
-        pin.parameters.push Pin::Parameter.new(decl: :arg, name: 'obj2')
-      end
-      dump = Marshal.dump(result)
-      file = File.open(ser, 'wb')
-      file.write dump
-      file.close
-      result
-    end
-
-    def load_stdlib_pins base
-      ser = File.join(File.dirname(CoreDocs.yardoc_stdlib_file), "#{base}.ser")
-      result = if File.file?(ser)
-        Solargraph.logger.info "Loading #{base} stdlib from cache"
-        file = File.open(ser, 'rb')
-        dump = file.read
-        file.close
-        begin
-          Marshal.load(dump)
-        rescue StandardError => e
-          Solargraph.logger.warn "Error loading #{base} stdlib pin cache: [#{e.class}] #{e.message}"
-          File.unlink ser
-          read_stdlib_and_save_cache(base, ser)
-        end
-      else
-        read_stdlib_and_save_cache(base, ser)
-      end
-      fills = StdlibFills.get(base)
-      unless fills.empty?
-        result = ApiMap::Store.new(result + fills).pins.reject { |pin| pin.is_a?(Pin::Reference::Override) }
-      end
-      result
-    end
-
-    def read_stdlib_and_save_cache base, ser
-      result = []
-      if stdlib_paths[base]
-        Solargraph.logger.info "Loading #{base} stdlib from yardoc"
-        result.concat Mapper.new(stdlib_paths[base]).map
-        unless result.empty?
-          dump = Marshal.dump(result)
-          file = File.open(ser, 'wb')
-          file.write dump
-          file.close
-        end
-      end
-      result
-    end
   end
 end
-
-Solargraph::YardMap::CoreDocs.require_minimum

data/lib/solargraph.rb

@@ -2,7 +2,6 @@
 
 Encoding.default_external = 'UTF-8'
 
-require 'solargraph/compat'
 require 'solargraph/version'
 
 # The top-level namespace for the Solargraph code mapping, documentation,
@@ -41,9 +40,10 @@ module Solargraph
   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__)
-  YARDOC_PATH = File.realpath(File.join(dir, '..', 'yardoc'))
   YARD_EXTENSION_FILE = File.join(dir, 'yard-solargraph.rb')
   VIEWS_PATH = File.join(dir, 'solargraph', 'views')
 

data/solargraph.gemspec

@@ -13,30 +13,35 @@ Gem::Specification.new do |s|
   s.files       = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  s.homepage    = 'http://solargraph.org'
+  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.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_runtime_dependency 'backport', '~> 1.2'
   s.add_runtime_dependency 'benchmark'
-  s.add_runtime_dependency 'bundler', '>= 1.17.2'
+  s.add_runtime_dependency 'bundler', '~> 2.0'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'
   s.add_runtime_dependency 'e2mmap'
   s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
   s.add_runtime_dependency 'kramdown', '~> 2.3'
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
   s.add_runtime_dependency 'parser', '~> 3.0'
-  s.add_runtime_dependency 'reverse_markdown', '>= 1.0.5', '< 3'
-  s.add_runtime_dependency 'rubocop', '>= 0.52'
+  s.add_runtime_dependency 'rbs', '~> 2.0'
+  s.add_runtime_dependency 'reverse_markdown', '~> 2.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_development_dependency 'pry'
   s.add_development_dependency 'public_suffix', '~> 3.1'
-  s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
+  s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'simplecov', '~> 0.14'
   s.add_development_dependency 'webmock', '~> 3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -137,39 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: reverse_markdown
+  name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
-    - - "<"
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -253,9 +261,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -263,9 +268,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -301,10 +303,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -321,7 +323,7 @@ files:
 - lib/solargraph/api_map/source_to_yard.rb
 - lib/solargraph/api_map/store.rb
 - lib/solargraph/bench.rb
-- lib/solargraph/compat.rb
+- lib/solargraph/cache.rb
 - lib/solargraph/complex_type.rb
 - lib/solargraph/complex_type/type_methods.rb
 - lib/solargraph/complex_type/unique_type.rb
@@ -329,6 +331,7 @@ files:
 - lib/solargraph/convention/base.rb
 - lib/solargraph/convention/gemfile.rb
 - lib/solargraph/convention/gemspec.rb
+- lib/solargraph/convention/rakefile.rb
 - lib/solargraph/convention/rspec.rb
 - lib/solargraph/converters/dd.rb
 - lib/solargraph/converters/dl.rb
@@ -463,6 +466,7 @@ files:
 - 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
@@ -493,10 +497,17 @@ files:
 - lib/solargraph/pin/reference/require.rb
 - lib/solargraph/pin/reference/superclass.rb
 - lib/solargraph/pin/search.rb
+- lib/solargraph/pin/signature.rb
 - lib/solargraph/pin/singleton.rb
 - lib/solargraph/pin/symbol.rb
 - lib/solargraph/position.rb
 - lib/solargraph/range.rb
+- lib/solargraph/rbs_map.rb
+- 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
@@ -541,24 +552,22 @@ files:
 - lib/solargraph/workspace/config.rb
 - lib/solargraph/yard_map.rb
 - lib/solargraph/yard_map/cache.rb
-- lib/solargraph/yard_map/core_docs.rb
-- lib/solargraph/yard_map/core_fills.rb
-- lib/solargraph/yard_map/core_gen.rb
 - lib/solargraph/yard_map/helpers.rb
 - lib/solargraph/yard_map/mapper.rb
 - lib/solargraph/yard_map/mapper/to_constant.rb
 - lib/solargraph/yard_map/mapper/to_method.rb
 - lib/solargraph/yard_map/mapper/to_namespace.rb
-- lib/solargraph/yard_map/rdoc_to_yard.rb
-- lib/solargraph/yard_map/stdlib_fills.rb
 - lib/solargraph/yard_map/to_method.rb
 - lib/yard-solargraph.rb
 - solargraph.gemspec
-- yardoc/2.2.2.tar.gz
-homepage: http://solargraph.org
+homepage: https://solargraph.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  funding_uri: https://www.patreon.com/castwide
+  bug_tracker_uri: https://github.com/castwide/solargraph/issues
+  changelog_uri: https://github.com/castwide/solargraph/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/castwide/solargraph
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -567,7 +576,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,19 +0,0 @@
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - jruby-head
-matrix:
-  include:
-    - rvm: 2.7
-      os: osx
-  allow_failures:
-    - rvm: jruby-head
-before_install:
-- gem update --system
-- gem install bundler
-before_script: yard gems
-script: rspec

data/lib/solargraph/compat.rb

@@ -1,37 +0,0 @@
-unless Hash.method_defined?(:transform_keys)
-  class Hash
-    def transform_keys &block
-      result = {}
-      each_pair do |k, v|
-        result[block.call(k)] = v
-      end
-      result
-    end
-  end
-end
-
-unless Hash.method_defined?(:transform_values)
-  class Hash
-    def transform_values &block
-      result = {}
-      each_pair do |k, v|
-        result[k] = block.call(v)
-      end
-      result
-    end
-  end
-end
-
-unless Array.method_defined?(:sum)
-  class Array
-    def sum &block
-      inject(0) do |s, x|
-        if block
-          s + block.call(x)
-        else
-          s + x
-        end
-      end
-    end
-  end
-end