solargraph 0.40.1 → 0.40.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02cce6c25457bb0284d221d1a9bef97730b7d7be18129cdee0dcfa1aae9c02b
-  data.tar.gz: 5143879ae0f89fd7ca608646cfe96fccc1e6c15afd7940fc7948dff358f286f3
+  metadata.gz: 70d201ad10b41bf9e0322370c2de7fa8c0efa25d8746b5b7cb3d1adc81902721
+  data.tar.gz: 7547665a359af045b4c9d1a0991d4dec4b37c621e7baf15b20656228ce69fa1f
 SHA512:
-  metadata.gz: 7c868fd6c6bb344f532eeee02ef06f9b80df086b51a49e408f5c04961303524f36d6b27cfae37b200a92bf0b65e15a3e68be029aad66bf912dd1aa73b1f48714
-  data.tar.gz: 6a9cbcd839ab51d1c71d83a30a73464f337faffda715059e91de57a3519783793574901f23d738c83a49d1116d41268c4992fa304c08d8892e394e12bb5011c8
+  metadata.gz: 4f79d086cf827d4bfa0a1c24c002a7487e742a0de65e5094126c9cb0dd12ca43aa08ec7e62debf074577adf81b8cd0d7e8916ee90676a3d2a5f0e8bfa6e9296c
+  data.tar.gz: 15afa63bb7bf32dfa51dff97432c8a8070d6521a364097b4f399e5a5962b25f9d86d336e26aad3810c66de01ba5ec273224030628d56b6640db60f10501cc578

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.40.2 - January 18, 2021
+- Type checker ignores splatted calls in arity (#396)
+- Allow Parser 3.0 (#400)
+
 ## 0.40.1 - December 28, 2020
 - Use temp directory for RuboCop formatting (#397)
 - NodeMethods reads splatted hashes (#396)

data/lib/.rubocop.yml

@@ -1,7 +1,7 @@
 Layout/EndOfLine:
   EnforcedStyle: lf
-Style/MethodDefParentheses:
-  Enabled: false
+# Style/MethodDefParentheses:
+#   Enabled: false
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Layout/SpaceAroundMethodCallOperator:

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

@@ -123,6 +123,10 @@ module Solargraph
           Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
         end
 
+        def splatted_call? node
+          Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat && node.children[0].children[0].type != :hash
+        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_methods.rb

@@ -106,11 +106,18 @@ module Solargraph
         end
 
         def splatted_hash? node
+          splatted_node?(node) && node.children[0].children[1].type == :HASH
+        end
+
+        def splatted_node? node
           node?(node.children[0]) &&
             [:ARRAY, :LIST].include?(node.children[0].type) &&
             node.children[0].children[0].nil? &&
-            node?(node.children[0].children[1]) &&
-            node.children[0].children[1].type == :HASH
+            node?(node.children[0].children[1])
+        end
+
+        def splatted_call? node
+          splatted_node?(node) && node.children[0].children[1].type != :HASH
         end
 
         def node? node

data/lib/solargraph/type_checker.rb

@@ -334,6 +334,8 @@ module Solargraph
       result
     end
 
+    # @param [Pin::Method]
+    # @return [Hash]
     def param_hash(pin)
       tags = pin.docstring.tags(:param)
       return {} if tags.empty?
@@ -346,6 +348,7 @@ module Solargraph
     end
 
     # @param [Array<Pin::Method>]
+    # @return [Hash]
     def first_param_hash(pins)
       pins.each do |pin|
         result = param_hash(pin)
@@ -413,24 +416,28 @@ module Solargraph
       end
       settled_kwargs = 0
       unless unchecked.empty?
-        kwargs = convert_hash(unchecked.last.node)
-        if pin.parameters.any? { |param| [:kwarg, :kwoptarg].include?(param.decl) || param.kwrestarg? }
-          if kwargs.empty?
-            add_params += 1
-          else
-            unchecked.pop
-            pin.parameters.each do |param|
-              next unless param.keyword?
-              if kwargs.key?(param.name.to_sym)
-                kwargs.delete param.name.to_sym
-                settled_kwargs += 1
-              elsif param.decl == :kwarg
-                return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
+        if Parser.is_ast_node?(unchecked.last.node) && splatted_call?(unchecked.last.node)
+          settled_kwargs = pin.parameters.count(&:keyword?)
+        else
+          kwargs = convert_hash(unchecked.last.node)
+          if pin.parameters.any? { |param| [:kwarg, :kwoptarg].include?(param.decl) || param.kwrestarg? }
+            if kwargs.empty?
+              add_params += 1
+            else
+              unchecked.pop
+              pin.parameters.each do |param|
+                next unless param.keyword?
+                if kwargs.key?(param.name.to_sym)
+                  kwargs.delete param.name.to_sym
+                  settled_kwargs += 1
+                elsif param.decl == :kwarg
+                  return [Problem.new(location, "Missing keyword argument #{param.name} to #{pin.path}")]
+                end
+              end
+              kwargs.clear if pin.parameters.any?(&:kwrestarg?)
+              unless kwargs.empty?
+                return [Problem.new(location, "Unrecognized keyword argument #{kwargs.keys.first} to #{pin.path}")]
               end
-            end
-            kwargs.clear if pin.parameters.any?(&:kwrestarg?)
-            unless kwargs.empty?
-              return [Problem.new(location, "Unrecognized keyword argument #{kwargs.keys.first} to #{pin.path}")]
             end
           end
         end

data/lib/solargraph/version.rb

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

data/solargraph.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   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', '~> 2.3'
+  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 'thor', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.40.1
+  version: 0.40.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
   requirement: !ruby/object:Gem::Requirement