solargraph 0.48.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7531e9e085d6b9645a2d44a9aa020d661769a05ebe9b15377d91d0217f1cebd1
-  data.tar.gz: 63d27c2e39cac69742d77866ba7c5ef49634d8598cc10aa8427ec150bf70d12b
+  metadata.gz: b0b66abd5cf5a0376d5521532dda16db328592eb38bac6acd84f997b19cb328c
+  data.tar.gz: 51e038df27bae1457393c7ff023c9951b0f8919267678e29aab2e21efeb2b1a8
 SHA512:
-  metadata.gz: 38929be15a4be6b9995f7b471a9fed4f51541027822bd92b78b2f6ca426a9b42477491c324066ea312f31ebeb43a73a373a457454edc8c14390ab25f403c727d
-  data.tar.gz: 1c16b8046376cde3f1a1393ca12b060b708b4c5be1c1e9ee4f2be0f03b2443c6dcbc77bce3190ce47cff7fe2f7726e0963a3f05e00956dadd5628c2a437aeab3
+  metadata.gz: 9b8310748d4754c27fd62763ce1bd8759fc43fc825b1b40353d4537130f2b6143cdb59101da679a8b4a7fb0778430eeac2eccbb845f7a9a5ac11f402b3a71461
+  data.tar.gz: 1b2f79f5396a3c056d0b2acbcb49d6c1385b02a49b33edbe1a3e452a7b451b9b87547b8b8d5974a17e25ea2f5c21db8dd315d2b3d856fb3c7ce2d300a4595c70

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: castwide

data/.github/workflows/rspec.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.49.0 - April 9, 2023
+- Better union type handling
+- First version of RBS support
+- Dependency updates
+- Update RuboCop config options
+- RBS core and stdlib mapping
+- Anonymous splats and multisig arity
+- Infinite loop when checking if a class is a superclass (#641)
+
 ## 0.48.0 - December 19, 2022
 - Add Sublime Text to README (#604)
 - Map nested constant assignments

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 by Fred Snyder for Castwide Technologies
+Copyright (c) 2017-2023 by Fred Snyder for Castwide Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/SPONSORS.md

@@ -10,8 +10,6 @@ The following people and organizations provide funding or other resources. [Beco
 
 ## Named Sponsors
 
-- Tom de Grunt
 - Akira Yamada
-- Erlend Finvåg
-- Matt Massicotte
-- Oscar Rivas
+- Joel Drapper
+- Yutaka Tachibana

data/lib/solargraph/api_map/store.rb

@@ -247,10 +247,22 @@ module Solargraph
           end
           ovr.tags.each do |tag|
             pin.docstring.add_tag(tag)
-            new_pin.docstring.add_tag(tag) if new_pin
+            redefine_return_type pin, tag
+            if new_pin
+              new_pin.docstring.add_tag(tag)
+              redefine_return_type new_pin, tag
+            end
           end
         end
       end
+
+      def redefine_return_type pin, tag
+        return unless pin && tag.tag_name == 'return'
+        pin.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
+        pin.signatures.each do |sig|
+          sig.instance_variable_set(:@return_type, ComplexType.try_parse(tag.type))
+        end
+      end
     end
   end
 end

data/lib/solargraph/api_map.rb

@@ -21,6 +21,8 @@ module Solargraph
     # @return [Array<String>]
     attr_reader :unresolved_requires
 
+    @@core_map = RbsMap::CoreMap.new
+
     # @return [Array<String>]
     attr_reader :missing_docs
 
@@ -40,7 +42,7 @@ module Solargraph
       @source_map_hash = {}
       implicit.clear
       cache.clear
-      @store = Store.new(yard_map.pins + pins)
+      @store = Store.new(@@core_map.pins + pins)
       self
     end
 
@@ -68,8 +70,10 @@ module Solargraph
       end
       external_requires.merge implicit.requires
       external_requires.merge bench.workspace.config.required
-      yard_map.change(external_requires, bench.workspace.directory, bench.workspace.source_gems)
-      @store = Store.new(yard_map.pins + implicit.pins + pins)
+      @rbs_maps = external_requires.map { |r| load_rbs_map(r) }
+      unresolved_requires = @rbs_maps.reject(&:resolved?).map(&:library)
+      yard_map.change(unresolved_requires, bench.workspace.directory, bench.workspace.source_gems)
+      @store = Store.new(@@core_map.pins + @rbs_maps.flat_map(&:pins) + yard_map.pins + implicit.pins + pins)
       @unresolved_requires = yard_map.unresolved_requires
       @missing_docs = yard_map.missing_docs
       @rebindable_method_names = nil
@@ -77,6 +81,14 @@ module Solargraph
       self
     end
 
+    def core_pins
+      @@core_map.pins
+    end
+
+    def yard_map
+      @yard_map ||= YardMap.new
+    end
+
     # @param name [String]
     # @return [YARD::Tags::MacroDirective, nil]
     def named_macro name
@@ -132,7 +144,8 @@ module Solargraph
 
     def rebindable_method_names
       @rebindable_method_names ||= begin
-        result = yard_map.rebindable_method_names
+        # result = yard_map.rebindable_method_names
+        result = ['instance_eval', 'instance_exec', 'class_eval', 'class_exec', 'module_eval', 'module_exec', 'define_method'].to_set
         source_maps.each do |map|
           result.merge map.rebindable_method_names
         end
@@ -191,7 +204,7 @@ module Solargraph
     #
     # @param namespace [String, nil] The namespace to match
     # @param context [String] The context to search
-    # @return [String]
+    # @return [String, nil]
     def qualify namespace, context = ''
       return namespace if ['self', nil].include?(namespace)
       cached = cache.get_qualified_namespace(namespace, context)
@@ -447,18 +460,15 @@ module Solargraph
     def super_and_sub?(sup, sub)
       fqsup = qualify(sup)
       cls = qualify(sub)
-      until fqsup.nil? || cls.nil?
+      tested = []
+      until fqsup.nil? || cls.nil? || tested.include?(cls)
         return true if cls == fqsup
+        tested.push cls
         cls = qualify_superclass(cls)
       end
       false
     end
 
-    # @return [YardMap]
-    def yard_map
-      @yard_map ||= YardMap.new
-    end
-
     # Check if the host class includes the specified module.
     #
     # @param host [String] The class
@@ -475,6 +485,14 @@ module Solargraph
     # @return [Hash{String => SourceMap}]
     attr_reader :source_map_hash
 
+    # @param library [String]
+    # @return [RbsMap]
+    def load_rbs_map library
+      # map = RbsMap.load(library)
+      # return map if map.resolved?
+      RbsMap::StdlibMap.load(library)
+    end
+
     # @return [ApiMap::Store]
     def store
       @store ||= Store.new
@@ -677,7 +695,7 @@ module Solargraph
         comments: origin.comments,
         scope: origin.scope,
         visibility: origin.visibility,
-        parameters: origin.parameters,
+        signatures: origin.signatures,
         attribute: origin.attribute?
       }
       Pin::Method.new **args

data/lib/solargraph/cache.rb

@@ -0,0 +1,51 @@
+require 'fileutils'
+
+module Solargraph
+  module Cache
+    class << self
+      # The base directory where cached documentation is installed.
+      #
+      # @return [String]
+      def base_dir
+        # The directory is not stored in a variable so it can be overridden
+        # in specs.
+        ENV['SOLARGRAPH_CACHE'] || File.join(Dir.home, '.solargraph', 'cache')
+      end
+
+      # The working directory for the current Ruby and Solargraph versions.
+      #
+      # @return [String]
+      def work_dir
+        # The directory is not stored in a variable so it can be overridden
+        # in specs.
+        File.join(base_dir, "ruby-#{RUBY_VERSION}", "rbs-#{RBS::VERSION}", "solargraph-#{Solargraph::VERSION}")
+      end
+
+      # @return [Array<Solargraph::Pin::Base>, nil]
+      def load *path
+        file = File.join(work_dir, *path)
+        return nil unless File.file?(file)
+        Marshal.load(File.read(file, mode: 'rb'))
+      rescue StandardError => e
+        Solargraph.logger.warn "Failed to load cached file #{file}: [#{e.class}] #{e.message}"
+        FileUtils.rm_f file
+        nil
+      end
+
+      # @return [Boolean]
+      def save *path, pins
+        return false if pins.empty?
+        file = File.join(work_dir, *path)
+        base = File.dirname(file)
+        FileUtils.mkdir_p base unless File.directory?(base)
+        ser = Marshal.dump(pins)
+        File.write file, ser, mode: 'wb'
+        true
+      end
+
+      def clear
+        FileUtils.rm_rf base_dir, secure: true
+      end
+    end
+  end
+end

data/lib/solargraph/complex_type/type_methods.rb

@@ -101,6 +101,7 @@ module Solargraph
       # @param context [String] The namespace from which to resolve names
       # @return [ComplexType] The generated ComplexType
       def qualify api_map, context = ''
+        return self if name == 'param'
         return ComplexType.new([self]) if duck_type? || void? || undefined?
         recon = (rooted? ? '' : context)
         fqns = api_map.qualify(name, recon)
@@ -109,12 +110,8 @@ module Solargraph
           return UniqueType::UNDEFINED
         end
         fqns = "::#{fqns}" # Ensure the resulting complex type is rooted
-        ltypes = key_types.map do |t|
-          t.qualify api_map, context
-        end
-        rtypes = value_types.map do |t|
-          t.qualify api_map, context
-        end
+        ltypes = key_types.map { |t| t.qualify api_map, context }.uniq
+        rtypes = value_types.map { |t| t.qualify api_map, context }.uniq
         if list_parameters?
           Solargraph::ComplexType.parse("#{fqns}<#{rtypes.map(&:tag).join(', ')}>")
         elsif fixed_parameters?

data/lib/solargraph/complex_type/unique_type.rb

@@ -8,6 +8,8 @@ module Solargraph
     class UniqueType
       include TypeMethods
 
+      attr_reader :all_params
+
       # Create a UniqueType with the specified name and an optional substring.
       # The substring is the parameter section of a parametrized type, e.g.,
       # for the type `Array<String>`, the name is `Array` and the substring is
@@ -27,6 +29,7 @@ module Solargraph
         @tag = @name + substring
         @key_types = []
         @subtypes = []
+        @all_params = []
         return unless parameters?
         if @substring.start_with?('<(') && @substring.end_with?(')>')
           subs = ComplexType.parse(substring[2..-3], partial: true)
@@ -40,12 +43,66 @@ module Solargraph
         else
           @subtypes.concat subs
         end
+        @all_params.concat @key_types
+        @all_params.concat @subtypes
       end
 
       def to_s
         tag
       end
 
+      def to_rbs
+        "#{namespace}#{parameters? ? "[#{subtypes.map { |s| s.to_rbs }.join(', ')}]" : ''}"
+      end
+  
+      def parameterized?
+        name == 'param' || all_params.any?(&:parameterized?)
+      end
+
+      def resolve_parameters definitions, context
+        new_name = if name == 'param'
+          idx = definitions.parameters.index(subtypes.first.name)
+          return ComplexType::UNDEFINED if idx.nil?
+          param_type = context.return_type.all_params[idx]
+          return ComplexType::UNDEFINED unless param_type
+          param_type.to_s
+        else
+          name
+        end
+        new_key_types = if name != 'param'
+          @key_types.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        else
+          []
+        end
+        new_subtypes = if name != 'param'
+          @subtypes.map { |t| t.resolve_parameters(definitions, context) }.select(&:defined?)
+        else
+          []
+        end
+        if name != 'param' && !(new_key_types.empty? && new_subtypes.empty?)
+          if hash_parameters?
+            UniqueType.new(new_name, "{#{new_key_types.join(', ')} => #{new_subtypes.join(', ')}}")
+          elsif parameters?
+            if @substring.start_with?'<('
+              UniqueType.new(new_name, "<(#{new_subtypes.join(', ')})>")
+            else
+              UniqueType.new(new_name, "<#{new_subtypes.join(', ')}>")
+            end
+          else
+            UniqueType.new(new_name)
+          end
+        else
+          UniqueType.new(new_name)
+        end
+
+        # idx = definitions.parameters.index(subtypes.first.name)
+        # STDERR.puts "Index: #{idx}"
+        # return ComplexType::UNDEFINED if idx.nil?
+        # param_type = context.return_type.all_params[idx]
+        # return ComplexType::UNDEFINED unless param_type
+        # ComplexType.try_parse(param_type.to_s)
+      end
+
       def self_to dst
         return self unless selfy?
         new_name = (@name == 'self' ? dst : @name)

data/lib/solargraph/complex_type.rb

@@ -30,6 +30,12 @@ module Solargraph
       @items.first
     end
 
+    def to_rbs
+      ((@items.length > 1 ? '(' : '') + @items.map do |item|
+        "#{item.namespace}#{item.parameters? ? "[#{item.subtypes.map { |s| s.to_rbs }.join(', ')}]" : ''}"
+      end.join(' | ') + (@items.length > 1 ? ')' : '')).gsub(/undefined/, 'untyped')
+    end
+
     def map &block
       @items.map &block
     end
@@ -85,13 +91,22 @@ module Solargraph
     end
 
     def any? &block
-      @items.any? &block
+      @items.compact.any? &block
     end
 
     def selfy?
       @items.any?(&:selfy?)
     end
 
+    def parameterized?
+      any?(&:parameterized?)
+    end
+
+    def resolve_parameters definitions, context
+      result = @items.map { |i| i.resolve_parameters(definitions, context) }
+      ComplexType.parse(*result.map(&:tag))
+    end
+
     # @param dst [String]
     # @return [ComplexType]
     def self_to dst
@@ -105,6 +120,10 @@ module Solargraph
       @items.any?(&:nil_type?)
     end
 
+    def all_params
+      @items.first.all_params || []
+    end
+
     private
 
     # @todo This is a quick and dirty hack that forces `self` keywords

data/lib/solargraph/convention/rakefile.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Convention
+    class Rakefile < Base
+      def local source_map
+        basename = File.basename(source_map.filename)
+        return EMPTY_ENVIRON unless basename.end_with?('.rake') || basename == 'Rakefile'
+
+        @environ ||= Environ.new(
+          requires: ['rake'],
+          domains: ['Rake::DSL']
+        )
+      end
+    end
+  end
+end

data/lib/solargraph/convention.rb

@@ -11,6 +11,7 @@ module Solargraph
     autoload :Gemfile, 'solargraph/convention/gemfile'
     autoload :Rspec,   'solargraph/convention/rspec'
     autoload :Gemspec, 'solargraph/convention/gemspec'
+    autoload :Rakefile, 'solargraph/convention/rakefile'
 
     @@conventions = Set.new
 
@@ -43,5 +44,6 @@ module Solargraph
     register Gemfile
     register Gemspec
     register Rspec
+    register Rakefile
   end
 end

data/lib/solargraph/diagnostics/rubocop.rb

@@ -23,15 +23,19 @@ module Solargraph
       # @param _api_map [Solargraph::ApiMap]
       # @return [Array<Hash>]
       def diagnose source, _api_map
+        @source = source
         require_rubocop(rubocop_version)
         options, paths = generate_options(source.filename, source.code)
         store = RuboCop::ConfigStore.new
         runner = RuboCop::Runner.new(options, store)
         result = redirect_stdout{ runner.run(paths) }
+        
+        return [] if result.empty?
+        
         make_array JSON.parse(result)
       rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
         raise DiagnosticsError, "Error in RuboCop configuration: #{e.message}"
-      rescue JSON::ParserError
+      rescue JSON::ParserError => e
         raise DiagnosticsError, "RuboCop returned invalid data: #{e.message}"
       end
 
@@ -89,8 +93,17 @@ module Solargraph
         if off['location']['start_line'] != off['location']['last_line']
           Position.new(off['location']['start_line'], 0)
         else
+          start_line = off['location']['start_line'] - 1
+          last_column = off['location']['last_column']
+          line = @source.code.lines[start_line]
+          col_off = if line.nil? || line.empty?
+            1
+          else
+            0
+          end
+
           Position.new(
-            off['location']['start_line'] - 1, off['location']['last_column'] - 1
+            start_line, last_column - col_off
           )
         end
       end

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -10,13 +10,15 @@ module Solargraph
       # Requires a specific version of rubocop, or the latest installed version
       # if _version_ is `nil`.
       #
-      # @param version [String]
+      # @param version [String, nil]
       # @raise [InvalidRubocopVersionError] if _version_ is not installed
       def require_rubocop(version = nil)
         begin
           gem_path = Gem::Specification.find_by_name('rubocop', version).full_gem_path
           gem_lib_path = File.join(gem_path, 'lib')
           $LOAD_PATH.unshift(gem_lib_path) unless $LOAD_PATH.include?(gem_lib_path)
+        # @todo Gem::MissingSpecVersionError is undocumented for some reason
+        # @sg-ignore
         rescue Gem::MissingSpecVersionError => e
           raise InvalidRubocopVersionError,
                 "could not find '#{e.name}' (#{e.requirement}) - "\

data/lib/solargraph/language_server/host.rb

@@ -130,35 +130,39 @@ module Solargraph
         end
       end
 
-      # Respond to a notification that a file was created in the workspace.
-      # The libraries will determine whether the file should be merged; see
+      # Respond to a notification that files were created in the workspace.
+      # The libraries will determine whether the files should be merged; see
       # Solargraph::Library#create_from_disk.
       #
-      # @param uri [String] The file uri.
-      # @return [Boolean] True if a library accepted the file.
-      def create uri
-        filename = uri_to_file(uri)
+      # @param uris [Array<String>] The URIs of the files.
+      # @return [Boolean] True if at least one library accepted at least one file.
+      def create *uris
+        filenames = uris.map { |uri| uri_to_file(uri) }
         result = false
         libraries.each do |lib|
-          result = true if lib.create_from_disk(filename)
+          result = true if lib.create_from_disk(*filenames)
+        end
+        uris.each do |uri|
+          diagnoser.schedule uri if open?(uri)
         end
-        diagnoser.schedule uri if open?(uri)
         result
       end
 
-      # Delete the specified file from the library.
+      # Delete the specified files from the library.
       #
-      # @param uri [String] The file uri.
+      # @param uris [Array<String>] The file uris.
       # @return [void]
-      def delete uri
-        filename = uri_to_file(uri)
+      def delete *uris
+        filenames = uris.map { |uri| uri_to_file(uri) }
         libraries.each do |lib|
-          lib.delete(filename)
+          lib.delete(*filenames)
+        end
+        uris.each do |uri|
+          send_notification "textDocument/publishDiagnostics", {
+            uri: uri,
+            diagnostics: []
+          }
         end
-        send_notification "textDocument/publishDiagnostics", {
-          uri: uri,
-          diagnostics: []
-        }
       end
 
       # Open the specified file in the library.
@@ -692,7 +696,7 @@ module Solargraph
         params['contentChanges'].each do |recvd|
           chng = check_diff(params['textDocument']['uri'], recvd)
           changes.push Solargraph::Source::Change.new(
-            (chng['range'].nil? ? 
+            (chng['range'].nil? ?
               nil :
               Solargraph::Range.from_to(chng['range']['start']['line'], chng['range']['start']['character'], chng['range']['end']['line'], chng['range']['end']['character'])
             ),

data/lib/solargraph/language_server/message/extended/download_core.rb

@@ -10,11 +10,7 @@ module Solargraph
         #
         class DownloadCore < Base
           def process
-            ver = Solargraph::YardMap::CoreDocs.best_download
-            Solargraph::YardMap::CoreDocs.download ver
-            host.show_message "Downloaded documentation for Ruby #{ver}.", LanguageServer::MessageTypes::INFO
-          rescue StandardError => e
-            host.show_message "An error occurred while downloading documentation: [#{e.class}] #{e.message}", LanguageServer::MessageTypes::ERROR
+            host.show_message "Downloading cores is deprecated. Solargraph currently uses RBS for core and stdlib documentation", LanguageServer::MessageTypes::INFO
           end
         end
       end

data/lib/solargraph/language_server/message/initialize.rb

@@ -25,6 +25,8 @@ module Solargraph
               }
             }
           }
+          # FIXME: lsp default is utf-16, may have different position
+          result[:capabilities][:positionEncoding] = "utf-32" if params.dig("capabilities", "general", "positionEncodings")&.include?("utf-32")
           result[:capabilities].merge! static_completion unless dynamic_registration_for?('textDocument', 'completion')
           result[:capabilities].merge! static_signature_help unless dynamic_registration_for?('textDocument', 'signatureHelp')
           # result[:capabilities].merge! static_on_type_formatting unless dynamic_registration_for?('textDocument', 'onTypeFormatting')

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -54,7 +54,7 @@ module Solargraph
           def cli_args file_uri, config
             file = UriHelpers.uri_to_file(file_uri)
             args = [
-              config['cops'] == 'all' ? '--auto-correct-all' : '--auto-correct',
+              config['cops'] == 'all' ? '--autocorrect-all' : '--autocorrect',
               '--cache', 'false',
               '--format', formatter_class(config).name,
             ]

data/lib/solargraph/language_server/message/text_document/signature_help.rb

@@ -9,13 +9,8 @@ module Solargraph
             line = params['position']['line']
             col = params['position']['character']
             suggestions = host.signatures_at(params['textDocument']['uri'], line, col)
-            info = []
-            suggestions.each do |pin|
-              info.concat pin.overloads.map(&:signature_help)
-              info.push pin.signature_help
-            end
             set_result({
-              signatures: info
+              signatures: suggestions.flat_map { |pin| pin.signature_help }
             })
           rescue FileNotFoundError => e
             Logging.logger.warn "[#{e.class}] #{e.message}"

data/lib/solargraph/language_server/message/workspace/did_change_watched_files.rb

@@ -10,22 +10,29 @@ module Solargraph::LanguageServer::Message::Workspace
 
     def process
       need_catalog = false
+      to_create = []
+      to_delete = []
+
       # @param change [Hash]
       params['changes'].each do |change|
         if change['type'] == CREATED
-          host.create change['uri']
+          to_create << change['uri']
           need_catalog = true
         elsif change['type'] == CHANGED
           next if host.open?(change['uri'])
-          host.create change['uri']
+          to_create << change['uri']
           need_catalog = true
         elsif change['type'] == DELETED
-          host.delete change['uri']
+          to_delete << change['uri']
           need_catalog = true
         else
           set_error Solargraph::LanguageServer::ErrorCodes::INVALID_PARAMS, "Unknown change type ##{change['type']} for #{uri_to_file(change['uri'])}"
         end
       end
+
+      host.create *to_create
+      host.delete *to_delete
+
       # Force host to catalog libraries after file changes (see castwide/solargraph#139)
       host.catalog if need_catalog
     end