solargraph 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1099281670bd5cacd480624f66b36d7ce8fb6b69b4486f080d0c0d6436c0f36c
-  data.tar.gz: 4b1e028bc357204b953c31916845a7f12caefc07d733dc90cfb5bc142401f2d4
+  metadata.gz: 89a1a9d76094688ff7ebe1af3dec4452c379819408ffc458eddcd75f5b66d2eb
+  data.tar.gz: 9b03143ba896ccd2d3bd0a44c9a1e90f06e3ed757a47a08e6b8aaf2a9f56e62e
 SHA512:
-  metadata.gz: 771c40ddff0a11757d1e9c4487802afc9f5b992840383f525643957d92516e735dc7328a8d23ed1ff4f0e55ceb09e3792eb24818758e4b217927bf4ba9708b5a
-  data.tar.gz: 948101863fc7f3f167dee00139f07ccdf5711afd12125aa2a18b708ed4ba6edaffbc7ba0c1a7a7dd09ad51460a0827546841cf2dbcd223198247fd86d8b0841b
+  metadata.gz: a6d4e99416af96a8a11ca569d096f4ba1491155f3fde1efc734e59c73d1794007d0b7b1e936c1dfb248472df1fa679c7701866176de99119e8f6a0b8eef721d4
+  data.tar.gz: edd612d341e6c9bb421e4bbb8db04badc855e924eca469c47943c374813025810151aca1abdd0da13100597803799a50c7355a362b8a0ae65187c0760464e840

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.43.0 - July 25, 2021
+- Correct arity checks when restarg precedes arg (#418)
+- Improve the performance of catalog by 4 times (#457)
+- Type checker validates duck type variables and params (#453)
+- Kernel#raise exception type checker
+- Pin::Base#inspect includes path
+- Fix arity with combined restargs and kwrestargs (#396)
+
+## 0.42.4 - July 11, 2021
+- Yardoc cache handling
+- Fix required_paths when gemspec is used (#451)
+- fix: yard stdout may break language client (#454)
+
+## 0.42.3 - June 14, 2021
+- Require 'pathname' for Library
+
+## 0.42.2 - June 14, 2021
+- Improve download-core command output
+- Ignore missing requests to client responses
+- Add automatically required gems to YardMap
+- Use closures to identify local variables
+
 ## 0.42.1 - June 11, 2021
 - YardMap#change sets new directory (#445)
 

data/SPONSORS.md

@@ -13,4 +13,3 @@ The following people and organizations provide funding or other resources. [Beco
 - Emily Strickland
 - Tom de Grunt
 - Akira Yamada
-- Jared White

data/lib/solargraph/api_map.rb

@@ -138,7 +138,7 @@ module Solargraph
 
     # An array of pins based on Ruby keywords (`if`, `end`, etc.).
     #
-    # @return [Array<Solargraph::Pin::Keyword>]
+    # @return [Enumerable<Solargraph::Pin::Keyword>]
     def keyword_pins
       store.pins_by_class(Pin::Keyword)
     end

data/lib/solargraph/api_map/bundler_methods.rb

@@ -9,7 +9,7 @@ module Solargraph
       # @param directory [String]
       # @return [Hash]
       def require_from_bundle directory
-        @require_from_bundle ||= begin
+        begin
           Solargraph.logger.info "Loading gems for bundler/require"
           Documentor.specs_from_bundle(directory)
         rescue BundleNotFoundError => e
@@ -17,11 +17,6 @@ module Solargraph
           {}
         end
       end
-
-      # @return [void]
-      def reset_require_from_bundle
-        @require_from_bundle = nil
-      end
     end
   end
 end

data/lib/solargraph/api_map/store.rb

@@ -5,10 +5,10 @@ require 'set'
 module Solargraph
   class ApiMap
     class Store
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       attr_reader :pins
 
-      # @param pins [Array<Solargraph::Pin::Base>]
+      # @param pins [Enumerable<Solargraph::Pin::Base>]
       def initialize pins = []
         @pins = pins
         index
@@ -16,7 +16,7 @@ module Solargraph
 
       # @param fqns [String]
       # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_constants fqns, visibility = [:public]
         namespace_children(fqns).select { |pin|
           !pin.name.empty? && (pin.is_a?(Pin::Namespace) || pin.is_a?(Pin::Constant)) && visibility.include?(pin.visibility)
@@ -26,7 +26,7 @@ module Solargraph
       # @param fqns [String]
       # @param scope [Symbol]
       # @param visibility [Array<Symbol>]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_methods fqns, scope: :instance, visibility: [:public]
         namespace_children(fqns).select do |pin|
           pin.is_a?(Pin::Method) && pin.scope == scope && visibility.include?(pin.visibility)
@@ -61,14 +61,14 @@ module Solargraph
       end
 
       # @param path [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_path_pins path
         path_pin_hash[path] || []
       end
 
       # @param fqns [String]
       # @param scope [Symbol] :class or :instance
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_instance_variables(fqns, scope = :instance)
         all_instance_variables.select { |pin|
           pin.binder.namespace == fqns && pin.binder.scope == scope
@@ -76,12 +76,12 @@ module Solargraph
       end
 
       # @param fqns [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_class_variables(fqns)
         namespace_children(fqns).select{|pin| pin.is_a?(Pin::ClassVariable)}
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def get_symbols
         symbols.uniq(&:name)
       end
@@ -97,12 +97,12 @@ module Solargraph
         @namespaces ||= Set.new
       end
 
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def namespace_pins
         pins_by_class(Solargraph::Pin::Namespace)
       end
 
-      # @return [Array<Solargraph::Pin::Method>]
+      # @return [Enumerable<Solargraph::Pin::Method>]
       def method_pins
         pins_by_class(Solargraph::Pin::Method)
       end
@@ -131,7 +131,7 @@ module Solargraph
         end
       end
 
-      # @return [Array<Pin::Block>]
+      # @return [Enumerable<Pin::Block>]
       def block_pins
         pins_by_class(Pin::Block)
       end
@@ -142,9 +142,9 @@ module Solargraph
       end
 
       # @param klass [Class]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def pins_by_class klass
-        @pin_select_cache[klass] ||= @pin_class_hash.select { |key, _| key <= klass }.values.flatten
+        @pin_select_cache[klass] ||= @pin_class_hash.each_with_object(Set.new) { |(key, o), n| n.merge(o) if key <= klass }
       end
 
       private
@@ -171,7 +171,7 @@ module Solargraph
         end
       end
 
-      # @return [Array<Solargraph::Pin::Symbol>]
+      # @return [Enumerable<Solargraph::Pin::Symbol>]
       def symbols
         pins_by_class(Pin::Symbol)
       end
@@ -193,7 +193,7 @@ module Solargraph
       end
 
       # @param name [String]
-      # @return [Array<Solargraph::Pin::Base>]
+      # @return [Enumerable<Solargraph::Pin::Base>]
       def namespace_children name
         namespace_map[name] || []
       end
@@ -216,8 +216,8 @@ module Solargraph
         set = pins.to_set
         @pin_class_hash = set.classify(&:class).transform_values(&:to_a)
         @pin_select_cache = {}
-        @namespace_map = set.classify(&:namespace).transform_values(&:to_a)
-        @path_pin_hash = set.classify(&:path).transform_values(&:to_a)
+        @namespace_map = set.classify(&:namespace)
+        @path_pin_hash = set.classify(&:path)
         @namespaces = @path_pin_hash.keys.compact.to_set
         pins_by_class(Pin::Reference::Include).each do |pin|
           include_references[pin.namespace] ||= []

data/lib/solargraph/bench.rb

@@ -3,7 +3,7 @@
 require 'set'
 
 module Solargraph
-  # A container of source maps and gem specs to be cataloged in an ApiMap.
+  # A container of source maps and workspace data to be cataloged in an ApiMap.
   #
   class Bench
     # @return [Set<SourceMap>]

data/lib/solargraph/complex_type.rb

@@ -51,6 +51,10 @@ module Solargraph
     def select &block
       @items.select &block
     end
+    def namespace
+      # cache this attr for high frequency call
+      @namespace ||= method_missing(:namespace).to_s
+    end
 
     def method_missing name, *args, &block
       return if @items.first.nil?

data/lib/solargraph/complex_type/type_methods.rb

@@ -72,9 +72,12 @@ module Solargraph
 
       # @return [String]
       def namespace
-        @namespace ||= 'Object' if duck_type?
-        @namespace ||= 'NilClass' if nil_type?
-        @namespace ||= (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
+        # if priority higher than ||=, old implements cause unnecessary check
+        @namespace ||= lambda do
+          return 'Object' if duck_type?
+          return 'NilClass' if nil_type?
+          return (name == 'Class' || name == 'Module') && !subtypes.empty? ? subtypes.first.name : name
+        end.call
       end
 
       # @return [Symbol] :class or :instance

data/lib/solargraph/language_server/host.rb

@@ -31,7 +31,7 @@ module Solargraph
         @cancel = []
         @buffer = String.new
         @stopped = true
-        @next_request_id = 0
+        @next_request_id = 1
         @dynamic_capabilities = Set.new
         @registered_capabilities = Set.new
       end
@@ -113,6 +113,7 @@ module Solargraph
             requests.delete request['id']
           else
             logger.warn "Discarding client response to unrecognized message #{request['id']}"
+            nil
           end
         else
           logger.warn "Invalid message received."

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

@@ -41,7 +41,8 @@ module Solargraph
           result = explicit_library_for(uri) ||
             implicit_library_for(uri) ||
             generic_library_for(uri)
-          result.attach sources.find(uri) if sources.include?(uri)
+          # previous library for already call attach. avoid call twice
+          # result.attach sources.find(uri) if sources.include?(uri)
           result
         end
 
@@ -82,7 +83,6 @@ module Solargraph
           libraries.each do |lib|
             if filename.start_with?(lib.workspace.directory)
               lib.attach sources.find(uri)
-              lib.catalog
               return lib
             end
           end
@@ -98,7 +98,6 @@ module Solargraph
         # @return [Library]
         def generic_library_for uri
           generic_library.attach sources.find(uri)
-          generic_library.catalog
           generic_library
         end
 

data/lib/solargraph/language_server/transport/adapter.rb

@@ -42,9 +42,7 @@ module Solargraph
         # @return [void]
         def process request
           message = @host.receive(request)
-          message.send_response
-          # tmp = @host.flush
-          # write tmp unless tmp.empty?
+          message && message.send_response
         end
 
         def shutdown

data/lib/solargraph/library.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Solargraph
   # A Library handles coordination between a Workspace and an ApiMap.
   #
@@ -46,7 +48,7 @@ module Solargraph
     # @return [void]
     def attach source
       mutex.synchronize do
-        if @current && @current.filename != source.filename && source_map_hash.key?(@current.filename) && !workspace.has_file?(@current.filename)
+        if @current && (!source || @current.filename != source.filename) && source_map_hash.key?(@current.filename) && !workspace.has_file?(@current.filename)
           source_map_hash.delete @current.filename
           source_map_external_require_hash.delete @current.filename
           @external_requires = nil
@@ -54,7 +56,7 @@ module Solargraph
         end
         @current = source
         maybe_map @current
-        api_map.catalog bench unless synchronized?
+        catalog_inlock
       end
     end
 
@@ -349,7 +351,7 @@ module Solargraph
         else
           args = line.split(':').map(&:strip)
           name = args.shift
-            reporter = Diagnostics.reporter(name)
+          reporter = Diagnostics.reporter(name)
           raise DiagnosticsError, "Diagnostics reporter #{name} does not exist" if reporter.nil?
           repargs[reporter] ||= []
           repargs[reporter].concat args
@@ -366,12 +368,16 @@ module Solargraph
     # @return [void]
     def catalog
       mutex.synchronize do
-        break if synchronized?
+        catalog_inlock
+      end
+    end
+
+    private def catalog_inlock
+        return if synchronized?
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
         api_map.catalog bench
         @synchronized = true
         logger.info "Catalog complete (#{api_map.source_maps.length} files, #{api_map.pins.length} pins)" if logger.info?
-      end
     end
 
     def bench
@@ -511,6 +517,7 @@ module Solargraph
     end
 
     def maybe_map source
+      return unless source
       if source_map_hash.key?(source.filename)
         return if source_map_hash[source.filename].code == source.code && 
           source_map_hash[source.filename].source.synchronized? &&

data/lib/solargraph/parser/legacy/node_chainer.rb

@@ -102,13 +102,26 @@ module Solargraph
             result.concat generate_links(n.children[0])
           elsif n.type == :block_pass
             result.push Chain::BlockVariable.new("&#{n.children[0].children[0].to_s}")
+          elsif n.type == :hash
+            result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
           else
             lit = infer_literal_node_type(n)
-            result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            # if lit == '::Hash'
+            #   result.push Chain::Hash.new(lit, hash_is_splatted?(n))
+            # else
+              result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            # end
           end
           result
         end
 
+        def hash_is_splatted? node
+          return false unless Parser.is_ast_node?(node) && node.type == :hash
+          return false unless Parser.is_ast_node?(node.children.last) && node.children.last.type == :kwsplat
+          return false if Parser.is_ast_node?(node.children.last.children[0]) && node.children.last.children[0].type == :hash
+          true
+        end
+
         def block_passed? node
           node.children.last.is_a?(::Parser::AST::Node) && node.children.last.type == :block_pass
         end

data/lib/solargraph/parser/legacy/node_methods.rb

@@ -97,8 +97,10 @@ module Solargraph
         end
 
         def convert_hash node
-          return {} unless Parser.is_ast_node?(node) && node.type == :hash
-          return convert_hash(node.children[0].children[0]) if splatted_hash?(node)
+          return {} unless Parser.is_ast_node?(node)
+          return convert_hash(node.children[0]) if node.type == :kwsplat
+          return convert_hash(node.children[0]) if Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
+          return {} unless node.type == :hash
           result = {}
           node.children.each do |pair|
             result[pair.children[0].children[0]] = Solargraph::Parser.chain(pair.children[1])
@@ -124,9 +126,14 @@ module Solargraph
         end
 
         def splatted_call? node
+          return false unless Parser.is_ast_node?(node)
           Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat && node.children[0].children[0].type != :hash
         end
 
+        def any_splatted_call?(nodes)
+          nodes.any? { |n| splatted_call?(n) }
+        end
+
         # @todo Temporarily here for testing. Move to Solargraph::Parser.
         def call_nodes_from node
           return [] unless node.is_a?(::Parser::AST::Node)

data/lib/solargraph/parser/node_processor/base.rb

@@ -4,9 +4,6 @@ module Solargraph
   module Parser
     module NodeProcessor
       class Base
-        # @todo The base node processor should not include legacy node methods
-        # include Legacy::NodeMethods
-
         # @return [Parser::AST::Node]
         attr_reader :node
 

data/lib/solargraph/parser/rubyvm/node_chainer.rb

@@ -97,13 +97,31 @@ module Solargraph
             result.concat generate_links(n.children[0])
           elsif n.type == :BLOCK_PASS
             result.push Chain::BlockVariable.new("&#{n.children[1].children[0].to_s}")
+          elsif n.type == :HASH
+            result.push Chain::Hash.new('::Hash', hash_is_splatted?(n))
           else
             lit = infer_literal_node_type(n)
-            result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
+            if lit
+              if lit == '::Hash'
+                result.push Chain::Hash.new(lit, hash_is_splatted?(n))
+              else
+                result.push Chain::Literal.new(lit)
+              end
+            else
+              result.push Chain::Link.new
+            end
+            # result.push (lit ? Chain::Literal.new(lit) : Chain::Link.new)
           end
           result
         end
 
+        def hash_is_splatted? node
+          return false unless Parser.is_ast_node?(node.children[0]) && node.children[0].type == :LIST
+          list = node.children[0].children
+          eol = list.rindex(&:nil?)
+          eol && Parser.is_ast_node?(list[eol + 1])
+        end
+
         def block_passed? node
           node.children.last.is_a?(RubyVM::AbstractSyntaxTree::Node) && node.children.last.type == :BLOCK_PASS
         end
@@ -114,6 +132,9 @@ module Solargraph
             node.children[0..-2].map { |c| NodeChainer.chain(c) }
           elsif node.type == :SPLAT
             [NodeChainer.chain(node)]
+          elsif node.type == :ARGSPUSH
+            result = node_to_argchains(node.children[0])
+            result.push NodeChainer.chain(node.children[1]) if Parser.is_ast_node?(node.children[1])
           elsif node.type == :ARGSCAT
             result = node.children[0].children[0..-2].map { |c| NodeChainer.chain(c) }
             result.push NodeChainer.chain(node.children[1])

data/lib/solargraph/parser/rubyvm/node_methods.rb

@@ -117,9 +117,14 @@ module Solargraph
         end
 
         def splatted_call? node
+          return false unless Parser.is_ast_node?(node)
           splatted_node?(node) && node.children[0].children[1].type != :HASH
         end
 
+        def any_splatted_call?(nodes)
+          nodes.any? { |n| splatted_call?(n) }
+        end
+
         def node? node
           node.is_a?(RubyVM::AbstractSyntaxTree::Node)
         end

data/lib/solargraph/pin/base.rb

@@ -218,7 +218,7 @@ module Solargraph
       end
 
       def inspect
-        "#<#{self.class} at #{self.location.inspect}>"
+        "#<#{self.class} `#{self.path}` at #{self.location.inspect}>"
       end
 
       protected

data/lib/solargraph/pin/local_variable.rb

@@ -3,7 +3,8 @@
 module Solargraph
   module Pin
     class LocalVariable < BaseVariable
-      include Localized
+      # @return [Range]
+      attr_reader :presence
 
       def initialize assignment: nil, presence: nil, **splat
         super(**splat)
@@ -16,6 +17,51 @@ module Solargraph
         @presence = pin.presence
         true
       end
+
+      # @param other [Pin::Base] The caller's block
+      # @param position [Position, Array(Integer, Integer)] The caller's position
+      # @return [Boolean]
+      def visible_from?(other, position)
+        position = Position.normalize(position)
+        other.filename == filename &&
+          match_tags(other.full_context.tag, full_context.tag) &&
+          (other == closure ||
+            (closure.location.range.contain?(other.location.range.start) && closure.location.range.contain?(other.location.range.ending))
+          ) &&
+          presence.contain?(position)
+      end
+
+      # @param other_loc [Location]
+      def visible_at?(other_closure, other_loc)
+        return true if location.filename == other_loc.filename &&
+          presence.include?(other_loc.range.start) &&
+          match_named_closure(other_closure, closure)
+      end
+
+      private
+
+      # @param tag1 [String]
+      # @param tag2 [String]
+      # @return [Boolean]
+      def match_tags tag1, tag2
+        # @todo This is an unfortunate hack made necessary by a discrepancy in
+        #   how tags indicate the root namespace. The long-term solution is to
+        #   standardize it, whether it's `Class<>`, an empty string, or
+        #   something else.
+        tag1 == tag2 ||
+          (['', 'Class<>'].include?(tag1) && ['', 'Class<>'].include?(tag2))
+      end
+
+      def match_named_closure needle, haystack
+        return true if needle == haystack
+        cursor = haystack
+        until cursor.nil?
+          return true if needle.path == cursor.path
+          return false if cursor.path && !cursor.path.empty?
+          cursor = cursor.closure
+        end
+        false
+      end
     end
   end
 end

data/lib/solargraph/shell.rb

@@ -76,12 +76,12 @@ module Solargraph
       ver = version || Solargraph::YardMap::CoreDocs.best_download
       if RUBY_VERSION != ver
         puts "Documentation for #{RUBY_VERSION} is not available. Reverting to closest match..."
-      else
-        puts "Downloading docs for #{ver}..."
       end
+      puts "Downloading docs for #{ver}..."
       Solargraph::YardMap::CoreDocs.download ver
       # Clear cached documentation if it exists
       FileUtils.rm_rf Dir.glob(File.join(Solargraph::YardMap::CoreDocs.cache_dir, ver, '*.ser'))
+      puts "Download complete."
     rescue ArgumentError => e
       STDERR.puts "ERROR: #{e.message}"
       STDERR.puts "Run `solargraph available-cores` for a list."

data/lib/solargraph/source.rb

@@ -6,19 +6,15 @@ module Solargraph
   # A Ruby file that has been parsed into an AST.
   #
   class Source
-    # autoload :FlawedBuilder, 'solargraph/source/flawed_builder'
     autoload :Updater,       'solargraph/source/updater'
     autoload :Change,        'solargraph/source/change'
     autoload :Mapper,        'solargraph/source/mapper'
-    # autoload :NodeMethods,   'solargraph/source/node_methods'
     autoload :EncodingFixes, 'solargraph/source/encoding_fixes'
     autoload :Cursor,        'solargraph/source/cursor'
     autoload :Chain,         'solargraph/source/chain'
     autoload :SourceChainer, 'solargraph/source/source_chainer'
-    # autoload :NodeChainer,   'solargraph/source/node_chainer'
 
     include EncodingFixes
-    # include NodeMethods
 
     # @return [String]
     attr_reader :filename
@@ -50,17 +46,9 @@ module Solargraph
         @node, @comments = Solargraph::Parser.parse_with_comments(@code, filename)
         @parsed = true
       rescue Parser::SyntaxError, EncodingError => e
-        # @todo 100% whitespace results in a nil node, so there's no reason to parse it.
-        #   We still need to determine whether the resulting node should be nil or a dummy
-        #   node with a location that encompasses the range.
-        # @node, @comments = Source.parse_with_comments(@code.gsub(/[^\s]/, ' '), filename)
         @node = nil
         @comments = {}
         @parsed = false
-      # rescue Exception => e
-      #   Solargraph.logger.warn "[#{e.class}] #{e.message}"
-      #   Solargraph.logger.warn e.backtrace.join("\n")
-      #   raise "Error parsing #{filename || '(source)'}: [#{e.class}] #{e.message}"
       ensure
         @code.freeze
       end

data/lib/solargraph/source/chain.rb

@@ -21,6 +21,7 @@ module Solargraph
       autoload :Or,               'solargraph/source/chain/or'
       autoload :BlockVariable,    'solargraph/source/chain/block_variable'
       autoload :ZSuper,           'solargraph/source/chain/z_super'
+      autoload :Hash,             'solargraph/source/chain/hash'
 
       @@inference_stack = []
       @@inference_depth = 0
@@ -61,10 +62,6 @@ module Solargraph
         working_pin = name_pin
         links[0..-2].each do |link|
           pins = link.resolve(api_map, working_pin, locals)
-          # Locals are only used when resolving the first link
-          # @todo There's a problem here. Call links need to resolve arguments
-          #   that might refer to local variables.
-          # locals = []
           type = infer_first_defined(pins, working_pin, api_map)
           return [] if type.undefined?
           working_pin = Pin::ProxyType.anonymous(type)

data/lib/solargraph/source/chain/call.rb

@@ -77,6 +77,7 @@ module Solargraph
               end
               if match
                 type = extra_return_type(ol, context)
+                break if type
                 type = ComplexType.try_parse(*ol.tag(:return).types).self_to(context.to_s).qualify(api_map, context.namespace) if ol.has_tag?(:return) && ol.tag(:return).types && !ol.tag(:return).types.empty? && (type.nil? || type.undefined?)
                 type ||= ComplexType::UNDEFINED
               end
@@ -170,8 +171,8 @@ module Solargraph
         # @param context [ComplexType]
         # @return [ComplexType]
         def extra_return_type docstring, context
-          if docstring.has_tag?(:return_single_parameter) && context.subtypes.one?
-            return context.subtypes.first
+          if docstring.has_tag?(:return_single_parameter) #&& context.subtypes.one?
+            return context.subtypes.first || ComplexType::UNDEFINED
           elsif docstring.has_tag?(:return_value_parameter) && context.value_types.one?
             return context.value_types.first
           end

data/lib/solargraph/source/chain/hash.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Hash < Literal
+        # @param type [String]
+        # @param splatted [Boolean]
+        def initialize type, splatted = false
+          super(type)
+          @splatted = splatted
+        end
+
+        def word
+          @word ||= "<#{@type}>"
+        end
+
+        def resolve api_map, name_pin, locals
+          [Pin::ProxyType.anonymous(@complex_type)]
+        end
+
+        def splatted?
+          @splatted
+        end
+      end
+    end
+  end
+end

data/lib/solargraph/source_map.rb

@@ -131,7 +131,8 @@ module Solargraph
     # @return [Array<Pin::LocalVariable>]
     def locals_at(location)
       return [] if location.filename != filename
-      locals.select { |pin| pin.visible_at?(location) }
+      closure = locate_named_path_pin(location.range.start.line, location.range.start.character)
+      locals.select { |pin| pin.visible_at?(closure, location) }
     end
 
     class << self

data/lib/solargraph/source_map/clip.rb

@@ -213,7 +213,7 @@ module Solargraph
             result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
             result.concat api_map.get_methods('Kernel')
             # result.concat ApiMap.keywords
-            result.concat api_map.keyword_pins
+            result.concat api_map.keyword_pins.to_a
             result.concat yielded_self_pins
           end
         end

data/lib/solargraph/type_checker.rb

@@ -148,6 +148,7 @@ module Solargraph
       all_variables.each do |pin|
         if pin.return_type.defined?
           declared = pin.typify(api_map)
+          next if declared.duck_type?
           if declared.defined?
             if rules.validate_tags?
               inferred = pin.probe(api_map)
@@ -416,7 +417,7 @@ module Solargraph
       end
       settled_kwargs = 0
       unless unchecked.empty?
-        if Parser.is_ast_node?(unchecked.last.node) && splatted_call?(unchecked.last.node)
+        if any_splatted_call?(unchecked.map(&:node))
           settled_kwargs = pin.parameters.count(&:keyword?)
         else
           kwargs = convert_hash(unchecked.last.node)
@@ -431,6 +432,7 @@ module Solargraph
                   kwargs.delete param.name.to_sym
                   settled_kwargs += 1
                 elsif param.decl == :kwarg
+                  return [] if arguments.last.links.last.is_a?(Solargraph::Source::Chain::Hash) && arguments.last.links.last.splatted?
                   return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
                 end
               end
@@ -450,12 +452,17 @@ module Solargraph
         if unchecked.length == req + opt + 1 && unchecked.last.links.last.is_a?(Source::Chain::BlockVariable)
           return []
         end
-        if req + add_params + 1 == unchecked.length && splatted_call?(unchecked.last.node) && (pin.parameters.map(&:decl) & [:kwarg, :kwoptarg, :kwrestarg]).any?
+        if req + add_params + 1 == unchecked.length && any_splatted_call?(unchecked.map(&:node)) && (pin.parameters.map(&:decl) & [:kwarg, :kwoptarg, :kwrestarg]).any?
           return []
         end
+        return [] if arguments.length - req == pin.parameters.select { |p| [:optarg, :kwoptarg].include?(p.decl) }.length
         return [Problem.new(location, "Too many arguments to #{pin.path}")]
-      elsif unchecked.length < req - settled_kwargs && (arguments.empty? || !arguments.last.splat?)
-        return [Problem.new(location, "Not enough arguments to #{pin.path}")]
+      elsif unchecked.length < req - settled_kwargs && (arguments.empty? || (!arguments.last.splat? && !arguments.last.links.last.is_a?(Solargraph::Source::Chain::Hash)))
+        # HACK: Kernel#raise signature is incorrect in Ruby 2.7 core docs.
+        # See https://github.com/castwide/solargraph/issues/418
+        unless arguments.empty? && pin.path == 'Kernel#raise'
+          return [Problem.new(location, "Not enough arguments to #{pin.path}")]
+        end
       end
       []
     end

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.42.1'
+  VERSION = '0.43.0'
 end

data/lib/solargraph/workspace.rb

@@ -183,7 +183,7 @@ module Solargraph
           end
         end
       end
-      result.concat config.require_paths
+      result.concat(config.require_paths.map { |p| File.join(directory, p) })
       result.push File.join(directory, 'lib') if result.empty?
       result
     end

data/lib/solargraph/yard_map.rb

@@ -156,12 +156,12 @@ module Solargraph
       @base_required ||= Set.new
     end
 
-    private
-
     def directory
       @directory ||= ''
     end
 
+    private
+
     # @return [YardMap::Cache]
     def cache
       @cache ||= YardMap::Cache.new
@@ -190,11 +190,8 @@ module Solargraph
 
     # @return [void]
     def process_requires
-      @gemset = if required.include?('bundler/require')
-        require_from_bundle(directory)
-      else
-        {}
-      end
+      @gemset = process_gemsets
+      required.merge @gemset.keys if required.include?('bundler/require')
       pins.replace core_pins
       unresolved_requires.clear
       stdlib_pins.clear
@@ -254,6 +251,11 @@ module Solargraph
       pins.concat environ.pins
     end
 
+    def process_gemsets
+      return {} if directory.empty? || !File.file?(File.join(directory, 'Gemfile'))
+      require_from_bundle(directory)
+    end
+
     # @param spec [Gem::Specification]
     # @return [void]
     def add_gem_dependencies spec
@@ -286,9 +288,6 @@ module Solargraph
     # @return [Array<Pin::Base>]
     def process_yardoc y, spec = nil
       return [] if y.nil?
-      size = Dir.glob(File.join(y, '**', '*'))
-        .map{ |f| File.size(f) }
-        .inject(:+)
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
         if File.file?(ser)
@@ -297,19 +296,24 @@ module Solargraph
           dump = file.read
           file.close
           begin
-            return Marshal.load(dump)
+            result = Marshal.load(dump)
+            return result unless result.nil? || result.empty?
+            Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
           rescue StandardError => e
             Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
             File.unlink ser
           end
         end
       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
-      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from yardoc"
       result = Mapper.new(YARD::Registry.all, spec).map
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
@@ -433,5 +437,3 @@ module Solargraph
 end
 
 Solargraph::YardMap::CoreDocs.require_minimum
-# Change YARD log IO to avoid sending unexpected messages to STDOUT
-YARD::Logger.instance.io = File.new(File::NULL, 'w')

data/lib/solargraph/yard_map/core_fills.rb

@@ -82,6 +82,18 @@ module Solargraph
         Override.method_return('Class#allocate', 'self'),
         Override.method_return('Class.allocate', 'Class<Object>'),
 
+        Override.from_comment('Enumerable#detect', %(
+@overload detect(&block)
+  @return_single_parameter
+@overload detect()
+  @return [Enumerator]
+        )),
+        Override.from_comment('Enumerable#find', %(
+@overload find(&block)
+  @return_single_parameter
+@overload find()
+  @return [Enumerator]
+        )),
         Override.method_return('Enumerable#select', 'self'),
 
         Override.method_return('File.absolute_path', 'String'),
@@ -111,7 +123,12 @@ module Solargraph
 @param y [Numeric]
 @return [Numeric]
         )),
-        Override.method_return('Integer#times', 'Enumerator', delete: [:overload]),
+        Override.from_comment('Integer#times', %(
+@overload times(&block)
+  @return [Integer]
+@overload times()
+  @return [Enumerator]
+        )),
 
         Override.method_return('Kernel#puts', 'nil'),
 

data/lib/yard-solargraph.rb

@@ -2,6 +2,9 @@
 
 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.

data/solargraph.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_runtime_dependency 'backport', '~> 1.1'
+  s.add_runtime_dependency 'backport', '~> 1.2'
   s.add_runtime_dependency 'benchmark'
   s.add_runtime_dependency 'bundler', '>= 1.17.2'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.43.0
 platform: ruby
 authors:
 - Fred Snyder
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -477,7 +477,6 @@ files:
 - lib/solargraph/pin/keyword.rb
 - lib/solargraph/pin/keyword_param.rb
 - lib/solargraph/pin/local_variable.rb
-- lib/solargraph/pin/localized.rb
 - lib/solargraph/pin/method.rb
 - lib/solargraph/pin/method_alias.rb
 - lib/solargraph/pin/namespace.rb
@@ -503,6 +502,7 @@ files:
 - lib/solargraph/source/chain/class_variable.rb
 - lib/solargraph/source/chain/constant.rb
 - lib/solargraph/source/chain/global_variable.rb
+- lib/solargraph/source/chain/hash.rb
 - lib/solargraph/source/chain/head.rb
 - lib/solargraph/source/chain/instance_variable.rb
 - lib/solargraph/source/chain/link.rb
@@ -554,7 +554,7 @@ homepage: http://solargraph.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -569,8 +569,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Ruby language server
 test_files: []

data/lib/solargraph/pin/localized.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Solargraph
-  module Pin
-    module Localized
-      # @return [Range]
-      attr_reader :presence
-
-      # @param other [Pin::Base] The caller's block
-      # @param position [Position, Array(Integer, Integer)] The caller's position
-      # @return [Boolean]
-      def visible_from?(other, position)
-        position = Position.normalize(position)
-        other.filename == filename &&
-          match_tags(other.full_context.tag, full_context.tag) &&
-          (other == closure ||
-            (closure.location.range.contain?(other.location.range.start) && closure.location.range.contain?(other.location.range.ending))
-          ) &&
-          presence.contain?(position)
-      end
-
-      # @param other_loc [Location]
-      def visible_at?(other_loc)
-        return false if location.filename != other_loc.filename
-        presence.include?(other_loc.range.start)
-      end
-
-      private
-
-      # @param tag1 [String]
-      # @param tag2 [String]
-      # @return [Boolean]
-      def match_tags tag1, tag2
-        # @todo This is an unfortunate hack made necessary by a discrepancy in
-        #   how tags indicate the root namespace. The long-term solution is to
-        #   standardize it, whether it's `Class<>`, an empty string, or
-        #   something else.
-        tag1 == tag2 ||
-          (['', 'Class<>'].include?(tag1) && ['', 'Class<>'].include?(tag2))
-      end
-    end
-  end
-end