solargraph 0.42.4 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ad96860cdfaaa7ce608149d111164649664a86e13567c63efb0218cac98bff
-  data.tar.gz: 12f96ea8a87a97a98e0f91774bff44ff3c736fe5268cbdb959cfbf0ce70c53b6
+  metadata.gz: 89a1a9d76094688ff7ebe1af3dec4452c379819408ffc458eddcd75f5b66d2eb
+  data.tar.gz: 9b03143ba896ccd2d3bd0a44c9a1e90f06e3ed757a47a08e6b8aaf2a9f56e62e
 SHA512:
-  metadata.gz: '00259fb37ec37b1090797678288f75fc9e1fd26db368d11f6e98f6c89b78745141d416a6a40cc507ce1f032056318c9f67946d9a6d9e17646aee0c9b54a1fd5d'
-  data.tar.gz: 264c5b2e39c4f946f9e375b7d5ef17f97d42c7b6343aa632f1c0319e1a2c6b2b2d73dc50f31b7b863b55b814e0b089cfae63137e8548927e2e0935c4e3243402
+  metadata.gz: a6d4e99416af96a8a11ca569d096f4ba1491155f3fde1efc734e59c73d1794007d0b7b1e936c1dfb248472df1fa679c7701866176de99119e8f6a0b8eef721d4
+  data.tar.gz: edd612d341e6c9bb421e4bbb8db04badc855e924eca469c47943c374813025810151aca1abdd0da13100597803799a50c7355a362b8a0ae65187c0760464e840

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 0.42.4
+## 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)

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/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/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/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/library.rb

@@ -56,7 +56,7 @@ module Solargraph
         end
         @current = source
         maybe_map @current
-        api_map.catalog bench unless synchronized?
+        catalog_inlock
       end
     end
 
@@ -368,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

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/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/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

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/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.4'
+  VERSION = '0.43.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.42.4
+  version: 0.43.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -502,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