solargraph 0.39.0 → 0.40.0

data/lib/solargraph/parser/legacy/node_processors/send_node.rb

@@ -10,20 +10,7 @@ module Solargraph
           def process
             if node.children[0].nil?
               if [:private, :public, :protected].include?(node.children[1])
-                if (node.children.length > 2)
-                  node.children[2..-1].each do |child|
-                    next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                    name = child.children[0].to_s
-                    matches = pins.select{ |pin| pin.is_a?(Pin::BaseMethod) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
-                    matches.each do |pin|
-                      # @todo Smelly instance variable access
-                      pin.instance_variable_set(:@visibility, node.children[1])
-                    end
-                  end
-                else
-                  # @todo Smelly instance variable access
-                  region.instance_variable_set(:@visibility, node.children[1])
-                end
+                process_visibility
               elsif node.children[1] == :module_function
                 process_module_function
               elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])
@@ -36,6 +23,8 @@ module Solargraph
                 process_prepend
               elsif node.children[1] == :require
                 process_require
+              elsif node.children[1] == :autoload
+                process_autoload
               elsif node.children[1] == :private_constant
                 process_private_constant
               elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
@@ -52,6 +41,27 @@ module Solargraph
 
           private
 
+          # @return [void]
+          def process_visibility
+            if (node.children.length > 2)
+              node.children[2..-1].each do |child|
+                if child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
+                  name = child.children[0].to_s
+                  matches = pins.select{ |pin| pin.is_a?(Pin::Method) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
+                  matches.each do |pin|
+                    # @todo Smelly instance variable access
+                    pin.instance_variable_set(:@visibility, node.children[1])
+                  end
+                else
+                  process_children region.update(visibility: node.children[1])
+                end
+              end
+            else
+              # @todo Smelly instance variable access
+              region.instance_variable_set(:@visibility, node.children[1])
+            end
+          end
+
           # @return [void]
           def process_attribute
             node.children[2..-1].each do |a|
@@ -59,26 +69,30 @@ module Solargraph
               clos = region.closure
               cmnt = comments_for(node)
               if node.children[1] == :attr_reader || node.children[1] == :attr_accessor
-                pins.push Solargraph::Pin::Attribute.new(
+                pins.push Solargraph::Pin::Method.new(
                   location: loc,
                   closure: clos,
                   name: a.children[0].to_s,
                   comments: cmnt,
-                  access: :reader,
                   scope: region.scope || :instance,
-                  visibility: region.visibility
+                  visibility: region.visibility,
+                  attribute: true
                 )
               end
               if node.children[1] == :attr_writer || node.children[1] == :attr_accessor
-                pins.push Solargraph::Pin::Attribute.new(
+                pins.push Solargraph::Pin::Method.new(
                   location: loc,
                   closure: clos,
                   name: "#{a.children[0]}=",
                   comments: cmnt,
-                  access: :writer,
                   scope: region.scope || :instance,
-                  visibility: region.visibility
+                  visibility: region.visibility,
+                  attribute: true
                 )
+                pins.last.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+                if pins.last.return_type.defined?
+                  pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.to_s.split(', '), 'value')
+                end
               end
             end
           end
@@ -88,7 +102,8 @@ module Solargraph
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure
               node.children[2..-1].each do |i|
-                pins.push Pin::Reference::Include.new(
+                type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+                pins.push type.new(
                   location: get_node_location(i),
                   closure: cp,
                   name: unpack_name(i)
@@ -138,6 +153,14 @@ module Solargraph
             end
           end
 
+          # @return [void]
+          def process_autoload
+            if node.children[3].is_a?(AST::Node) && node.children[3].type == :str
+              path = node.children[3].children[0].to_s
+              pins.push Pin::Reference::Require.new(get_node_location(node), path)
+            end
+          end
+
           # @return [void]
           def process_module_function
             if node.children[2].nil?
@@ -146,13 +169,14 @@ module Solargraph
             elsif node.children[2].type == :sym || node.children[2].type == :str
               node.children[2..-1].each do |x|
                 cn = x.children[0].to_s
-                ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.closure.full_context.namespace && p.name == cn}.first
+                ref = pins.select{ |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }.first
                 unless ref.nil?
                   pins.delete ref
                   mm = Solargraph::Pin::Method.new(
                     location: ref.location,
                     closure: ref.closure,
                     name: ref.name,
+                    parameters: ref.parameters,
                     comments: ref.comments,
                     scope: :class,
                     visibility: :public,
@@ -162,6 +186,7 @@ module Solargraph
                     location: ref.location,
                     closure: ref.closure,
                     name: ref.name,
+                    parameters: ref.parameters,
                     comments: ref.comments,
                     scope: :instance,
                     visibility: :private,
@@ -216,7 +241,7 @@ module Solargraph
           # @return [Boolean]
           def process_private_class_method
             if node.children[2].type == :sym || node.children[2].type == :str
-              ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.closure.full_context.namespace && p.name == node.children[2].children[0].to_s}.first
+              ref = pins.select { |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == node.children[2].children[0].to_s }.first
               # HACK: Smelly instance variable access
               ref.instance_variable_set(:@visibility, :private) unless ref.nil?
               false

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

@@ -27,6 +27,7 @@ module Solargraph
           @region = region
           @pins = pins
           @locals = locals
+          @processed_children = false
         end
 
         # Subclasses should override this method to generate new pins.
@@ -41,6 +42,8 @@ module Solargraph
         # @param subregion [Region]
         # @return [void]
         def process_children subregion = region
+          return if @processed_children
+          @processed_children = true
           node.children.each do |child|
             next unless Parser.is_ast_node?(child)
             NodeProcessor.process(child, subregion, pins, locals)

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

@@ -8,7 +8,7 @@ module Solargraph
         # @param filename [String]
         # @return [Array(Parser::AST::Node, Array<Parser::Source::Comment>)]
         def parse_with_comments code, filename = nil
-          node = RubyVM::AbstractSyntaxTree.parse(code)
+          node = RubyVM::AbstractSyntaxTree.parse(code).children[2]
           comments = CommentRipper.new(code).parse
           [node, comments]
         rescue ::SyntaxError => e
@@ -20,7 +20,7 @@ module Solargraph
         # @param line [Integer]
         # @return [Parser::AST::Node]
         def parse code, filename = nil, line = 0
-          RubyVM::AbstractSyntaxTree.parse(code)
+          RubyVM::AbstractSyntaxTree.parse(code).children[2]
         rescue ::SyntaxError => e
           raise Parser::SyntaxError, e.message
         end
@@ -83,6 +83,10 @@ module Solargraph
           NodeChainer.chain *args
         end
 
+        def chain_string *args
+          NodeChainer.load_string *args
+        end
+
         def process_node *args
           Solargraph::Parser::NodeProcessor.process *args
         end

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

@@ -15,7 +15,7 @@ module Solargraph
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
-          @in_block = in_block
+          @in_block = in_block ? 1 : 0
         end
 
         # @return [Source::Chain]
@@ -52,25 +52,27 @@ module Solargraph
           return generate_links(n.children[0]) if n.type == :SPLAT
           result = []
           if n.type == :ITER
-            @in_block = true
+            @in_block += 1
             result.concat generate_links(n.children[0])
-            @in_block = false
+            @in_block -= 1
           elsif n.type == :CALL || n.type == :OPCALL
             n.children[0..-3].each do |c|
               result.concat generate_links(c)
             end
-            result.push Chain::Call.new(n.children[-2].to_s, node_to_argchains(n.children.last), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[-2].to_s, node_to_argchains(n.children.last), @in_block > 0 || block_passed?(n))
           elsif n.type == :ATTRASGN
             result.concat generate_links(n.children[0])
-            result.push Chain::Call.new(n.children[1].to_s, node_to_argchains(n.children[2]), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[1].to_s, node_to_argchains(n.children[2]), @in_block > 0 || block_passed?(n))
           elsif n.type == :VCALL
-            result.push Chain::Call.new(n.children[0].to_s, [], @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[0].to_s, [], @in_block > 0 || block_passed?(n))
           elsif n.type == :FCALL
-            result.push Chain::Call.new(n.children[0].to_s, node_to_argchains(n.children[1]), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[0].to_s, node_to_argchains(n.children[1]), @in_block > 0 || block_passed?(n))
           elsif n.type == :SELF
             result.push Chain::Head.new('self')
-          elsif [:SUPER, :ZSUPER].include?(n.type)
-            result.push Chain::Head.new('super')
+          elsif n.type == :ZSUPER
+            result.push Chain::ZSuper.new('super', @in_block > 0 || block_passed?(n))
+          elsif n.type == :SUPER
+            result.push Chain::Call.new('super', node_to_argchains(n.children.last), @in_block > 0 || block_passed?(n))
           elsif [:COLON2, :COLON3, :CONST].include?(n.type)
             const = unpack_name(n)
             result.push Chain::Constant.new(const)

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

@@ -76,6 +76,10 @@ module Solargraph
           if node.type == :ITER
             result.push node.children[0]
             node.children[1..-1].each { |child| result.concat call_nodes_from(child) }
+          elsif node.type == :MASGN
+            # @todo We're treating a mass assignment as a call node, but the
+            #   type checker still needs the logic to handle it.
+            result.push node
           elsif [:CALL, :VCALL, :FCALL, :ATTRASGN, :OPCALL].include?(node.type)
             result.push node
             node.children.each { |child| result.concat call_nodes_from(child) }
@@ -91,6 +95,7 @@ module Solargraph
           index = 0
           until index > node.children[0].children.length - 2
             k = node.children[0].children[index]
+            return {} unless node?(k)
             v = node.children[0].children[index + 1]
             result[k.children[0]] = Solargraph::Parser.chain(v)
             index += 2
@@ -192,7 +197,7 @@ module Solargraph
                 result.push node
                 result.concat get_return_nodes_only(node.children[1])
               elsif node.type == :CASE
-                node.children.each do |cc|
+                node.children[1..-1].each do |cc|
                   result.concat reduce_to_value_nodes(cc.children[1..-1])
                 end
               else

data/lib/solargraph/parser/rubyvm/node_processors/args_node.rb

@@ -6,17 +6,31 @@ module Solargraph
       module NodeProcessors
         class ArgsNode < Parser::NodeProcessor::Base
           def process
-            if region.closure.is_a?(Pin::BaseMethod) || region.closure.is_a?(Pin::Block)
-              node.children[0].times do |i|
-                locals.push Solargraph::Pin::Parameter.new(
-                  location: region.closure.location,
-                  closure: region.closure,
-                  comments: comments_for(node),
-                  name: region.lvars[i].to_s,
-                  presence: region.closure.location.range,
-                  decl: :arg
-                )
-                region.closure.parameters.push locals.last
+            if region.closure.is_a?(Pin::Method) || region.closure.is_a?(Pin::Block)
+              if region.lvars[0].nil?
+                node.children[0].times do |i|
+                  locals.push Solargraph::Pin::Parameter.new(
+                    location: region.closure.location,
+                    closure: region.closure,
+                    comments: comments_for(node),
+                    name: extract_name(node.children[i + 1]),
+                    presence: region.closure.location.range,
+                    decl: :arg
+                  )
+                  region.closure.parameters.push locals.last
+                end
+              else
+                node.children[0].times do |i|
+                  locals.push Solargraph::Pin::Parameter.new(
+                    location: region.closure.location,
+                    closure: region.closure,
+                    comments: comments_for(node),
+                    name: region.lvars[i].to_s,
+                    presence: region.closure.location.range,
+                    decl: :arg
+                  )
+                  region.closure.parameters.push locals.last
+                end
               end
               # @todo Optional args, keyword args, etc.
               if node.children[6]
@@ -55,6 +69,16 @@ module Solargraph
             end
             process_children
           end
+
+          private
+
+          def extract_name var
+            if Parser.is_ast_node?(var)
+              var.children[0].to_s
+            else
+              var.to_s
+            end
+          end
         end
       end
     end

data/lib/solargraph/parser/rubyvm/node_processors/ivasgn_node.rb

@@ -19,7 +19,7 @@ module Solargraph
             if region.visibility == :module_function
               rng = Range.from_node(node)
               named_path = named_path_pin(rng.start)
-              if named_path.is_a?(Pin::BaseMethod)
+              if named_path.is_a?(Pin::Method)
                 pins.push Solargraph::Pin::InstanceVariable.new(
                   location: loc,
                   closure: Pin::Namespace.new(type: :module, closure: region.closure.closure, name: region.closure.name),

data/lib/solargraph/parser/rubyvm/node_processors/kw_arg_node.rb

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: require_keyword?(node) ? :kwarg : :kwoptarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| [:kwrestarg, :blockarg].include?(par.decl) }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
 

data/lib/solargraph/parser/rubyvm/node_processors/opt_arg_node.rb

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: :optarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| par.decl != :arg }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
         end

data/lib/solargraph/parser/rubyvm/node_processors/send_node.rb

@@ -9,30 +9,17 @@ module Solargraph
 
           def process
             if [:private, :public, :protected].include?(node.children[0])
-              if (node.type == :FCALL && node.children.last.children.length > 1)
-                node.children.last.children[0..-2].each do |child|
-                  # next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                  next unless child.type == :LIT || child.type == :STR
-                  name = child.children[0].to_s
-                  matches = pins.select{ |pin| pin.is_a?(Pin::BaseMethod) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
-                  matches.each do |pin|
-                    # @todo Smelly instance variable access
-                    pin.instance_variable_set(:@visibility, node.children[0])
-                  end
-                end
-              else
-                # @todo Smelly instance variable access
-                region.instance_variable_set(:@visibility, node.children[0])
-              end
+              process_visibility
             elsif node.children[0] == :module_function
               process_module_function
             elsif node.children[0] == :require
               process_require
+            elsif node.children[0] == :autoload
+              process_autoload
             elsif node.children[0] == :alias_method
               process_alias_method
-            elsif node.children[0] == :private_class_method && Parser.is_ast_node?(node)
-              # Processing a private class can potentially handle children on its own
-              return if process_private_class_method
+            elsif node.children[0] == :private_class_method
+              process_private_class_method
             elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[0])
               process_attribute
             elsif node.children[0] == :include
@@ -43,52 +30,36 @@ module Solargraph
               process_prepend
             elsif node.children[0] == :private_constant
               process_private_constant
+            elsif node.children[1] == :require && unpack_name(node.children[0]) == 'Bundler'
+              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require')
             end
             process_children
-            return
-            # @todo Get rid of legacy
-            if node.children[0].nil?
-              if [:private, :public, :protected].include?(node.children[1])
-                if (node.children.length > 2)
-                  node.children[2..-1].each do |child|
-                    next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
-                    name = child.children[0].to_s
-                    matches = pins.select{ |pin| pin.is_a?(Pin::BaseMethod) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
-                    matches.each do |pin|
-                      # @todo Smelly instance variable access
-                      pin.instance_variable_set(:@visibility, node.children[1])
-                    end
+          end
+
+          private
+
+          # @return [void]
+          def process_visibility
+            if node.type == :FCALL && Parser.is_ast_node?(node.children.last)
+              node.children.last.children[0..-2].each do |child|
+                # next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
+                if child.type == :LIT || child.type == :STR
+                  name = child.children[0].to_s
+                  matches = pins.select{ |pin| pin.is_a?(Pin::Method) && pin.name == name && pin.namespace == region.closure.full_context.namespace && pin.context.scope == (region.scope || :instance)}
+                  matches.each do |pin|
+                    # @todo Smelly instance variable access
+                    pin.instance_variable_set(:@visibility, node.children[0])
                   end
                 else
-                  # @todo Smelly instance variable access
-                  region.instance_variable_set(:@visibility, node.children[1])
+                  process_children region.update(visibility: node.children[0])
                 end
-              elsif node.children[1] == :module_function
-                process_module_function
-              elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[1])
-                process_attribute
-              elsif node.children[1] == :include
-                process_include
-              elsif node.children[1] == :extend
-                process_extend
-              elsif node.children[1] == :require
-                process_require
-              elsif node.children[1] == :private_constant
-                process_private_constant
-              elsif node.children[1] == :alias_method && node.children[2] && node.children[2] && node.children[2].type == :sym && node.children[3] && node.children[3].type == :sym
-                process_alias_method
-              elsif node.children[1] == :private_class_method && node.children[2].is_a?(AST::Node)
-                # Processing a private class can potentially handle children on its own
-                return if process_private_class_method
               end
-            elsif node.children[1] == :require && node.children[0].to_s == '(const nil :Bundler)'
-              pins.push Pin::Reference::Require.new(Solargraph::Location.new(region.filename, Solargraph::Range.from_to(0, 0, 0, 0)), 'bundler/require')
+            else
+              # @todo Smelly instance variable access
+              region.instance_variable_set(:@visibility, node.children[0])
             end
-            process_children
           end
 
-          private
-
           # @return [void]
           def process_attribute
             return unless Parser.is_ast_node?(node.children[1])
@@ -98,26 +69,30 @@ module Solargraph
               clos = region.closure
               cmnt = comments_for(node)
               if node.children[0] == :attr_reader || node.children[0] == :attr_accessor
-                pins.push Solargraph::Pin::Attribute.new(
+                pins.push Solargraph::Pin::Method.new(
                   location: loc,
                   closure: clos,
                   name: a.children[0].to_s,
                   comments: cmnt,
-                  access: :reader,
                   scope: region.scope || :instance,
-                  visibility: region.visibility
+                  visibility: region.visibility,
+                  attribute: true
                 )
               end
               if node.children[0] == :attr_writer || node.children[0] == :attr_accessor
-                pins.push Solargraph::Pin::Attribute.new(
+                pins.push Solargraph::Pin::Method.new(
                   location: loc,
                   closure: clos,
                   name: "#{a.children[0]}=",
                   comments: cmnt,
-                  access: :writer,
                   scope: region.scope || :instance,
-                  visibility: region.visibility
+                  visibility: region.visibility,
+                  attribute: true
                 )
+                pins.last.parameters.push Pin::Parameter.new(name: 'value', decl: :arg, closure: pins.last)
+                if pins.last.return_type.defined?
+                  pins.last.docstring.add_tag YARD::Tags::Tag.new(:param, '', pins.last.return_type.to_s.split(', '), 'value')
+                end
               end
             end
           end
@@ -127,7 +102,8 @@ module Solargraph
             return unless Parser.is_ast_node?(node.children.last)
             node.children.last.children[0..-2].each do |i|
               next unless [:COLON2, :COLON3, :CONST].include?(i.type)
-              pins.push Pin::Reference::Include.new(
+              type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+              pins.push type.new(
                 location: get_node_location(i),
                 closure: region.closure,
                 name: unpack_name(i)
@@ -181,6 +157,15 @@ module Solargraph
             end
           end
 
+          # @return [void]
+          def process_autoload
+            return unless Parser.is_ast_node?(node.children[1]) && Parser.is_ast_node?(node.children[1].children[1])
+            arg = node.children[1].children[1]
+            if arg.type == :STR
+              pins.push Pin::Reference::Require.new(get_node_location(arg), arg.children[0])
+            end
+          end
+
           # @return [void]
           def process_module_function
             if node.type == :VCALL
@@ -192,7 +177,7 @@ module Solargraph
               node.children.last.children[0..-2].each do |x|
                 next unless [:LIT, :STR].include?(x.type)
                 cn = x.children[0].to_s
-                ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.closure.full_context.namespace && p.name == cn}.first
+                ref = pins.select { |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == cn }.first
                 unless ref.nil?
                   pins.delete ref
                   mm = Solargraph::Pin::Method.new(
@@ -241,6 +226,7 @@ module Solargraph
 
           # @return [void]
           def process_private_constant
+            # @todo Bare `private_constant` causes an error
             node.children.last.children[0..-2].each do |child|
               if [:LIT, :STR].include?(child.type)
                 cn = child.children[0].to_s
@@ -268,19 +254,18 @@ module Solargraph
             )
           end
 
-          # @return [Boolean]
+          # @return [void]
           def process_private_class_method
+            return false unless Parser.is_ast_node?(node.children.last)
             if node.children.last.children.first.type == :DEFN
               process_children region.update(scope: :class, visibility: :private)
-              true
             else
               node.children.last.children[0..-2].each do |child|
                 if child.type == :LIT && child.children.first.is_a?(::Symbol)
                   sym_name = child.children.first.to_s
-                  ref = pins.select{|p| [Solargraph::Pin::Method, Solargraph::Pin::Attribute].include?(p.class) && p.namespace == region.closure.full_context.namespace && p.name == sym_name}.first
+                  ref = pins.select { |p| p.is_a?(Pin::Method) && p.namespace == region.closure.full_context.namespace && p.name == sym_name }.first
                   # HACK: Smelly instance variable access
                   ref.instance_variable_set(:@visibility, :private) unless ref.nil?
-                  false
                 end
               end
             end

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

@@ -36,6 +36,7 @@ module Solargraph
       register :RESBODY,    Rubyvm::NodeProcessors::ResbodyNode
       register :DEFN,       Rubyvm::NodeProcessors::DefNode
       register :DEFS,       Rubyvm::NodeProcessors::DefsNode
+      register :CALL,       Rubyvm::NodeProcessors::SendNode
       register :FCALL,      Rubyvm::NodeProcessors::SendNode
       register :VCALL,      Rubyvm::NodeProcessors::SendNode
       register :CLASS,      Rubyvm::NodeProcessors::NamespaceNode
@@ -53,6 +54,7 @@ module Solargraph
       register :KW_ARG,     Rubyvm::NodeProcessors::KwArgNode
       register :ITER,       Rubyvm::NodeProcessors::BlockNode
       register :LAMBDA,     Rubyvm::NodeProcessors::BlockNode
+      register :FOR,        Rubyvm::NodeProcessors::BlockNode
       register :OP_ASGN_OR, Rubyvm::NodeProcessors::OrasgnNode
       register :LIT,        Rubyvm::NodeProcessors::LitNode
     end

data/lib/solargraph/pin/base.rb

@@ -23,7 +23,7 @@ module Solargraph
 
       # @param location [Solargraph::Location]
       # @param kind [Integer]
-      # @param closure [String]
+      # @param closure [Solargraph::Pin::Closure]
       # @param name [String]
       # @param comments [String]
       def initialize location: nil, closure: nil, name: '', comments: ''
@@ -38,7 +38,7 @@ module Solargraph
         @comments ||= ''
       end
 
-      # @return [String]
+      # @return [String, nil]
       def filename
         return nil if location.nil?
         location.filename

data/lib/solargraph/pin/base_variable.rb

@@ -11,7 +11,7 @@ module Solargraph
 
       # @param assignment [Parser::AST::Node, nil]
       def initialize assignment: nil, **splat
-        super(splat)
+        super(**splat)
         @assignment = assignment
       end