solargraph 0.32.5 → 0.33.0

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

@@ -8,47 +8,51 @@ module Solargraph
         # @return [Array<Chain>]
         attr_reader :arguments
 
+        # @param word [String]
+        # @param arguments [Array<Chain>]
         def initialize word, arguments = []
           @word = word
           @arguments = arguments
         end
 
+        # @param api_map [ApiMap]
+        # @param name_pin [Pin::Base]
+        # @param locals [Array<Pin::Base>]
         def resolve api_map, name_pin, locals
           found = locals.select{|p| p.name == word}
           return inferred_pins(found, api_map, name_pin.context, locals) unless found.empty?
-          pins = api_map.get_method_stack(name_pin.context.namespace, word, scope: name_pin.context.scope)
+          pins = api_map.get_method_stack(name_pin.binder.namespace, word, scope: name_pin.binder.scope)
           return [] if pins.empty?
-          pins.unshift virtual_new_pin(pins.first, name_pin.context) if external_constructor?(pins.first, name_pin.context)
           inferred_pins(pins, api_map, name_pin.context, locals)
         end
 
         private
 
-        # Create a `new` pin to facilitate type inference. This is necessary for
-        # classes from YARD and classes in the namespace that do not have an
-        # `initialize` method.
-        #
-        # @param new_pin [Solargraph::Pin::Base]
-        # @param context [Solargraph::ComplexType]
-        # @return [Pin::Method]
-        def virtual_new_pin new_pin, context
-          case new_pin.path
-          when 'Class.new'
-            Pin::ProxyType.anonymous(ComplexType.try_parse('Class<Object>'))
-          when 'Class#new'
-            Pin::ProxyType.anonymous(ComplexType.try_parse(context.namespace == 'Class' ? 'Object' : context.namespace))
-          else
-            Pin::ProxyType.anonymous(ComplexType.try_parse(context.namespace))
-          end
-        end
-
         def inferred_pins pins, api_map, context, locals
           result = pins.map do |p|
-            if CoreFills::METHODS_RETURNING_SELF.include?(p.path)
-              next Solargraph::Pin::Method.new(p.location, p.namespace, p.name, "@return [#{context.tag}]", p.scope, p.visibility, p.parameters, p.node)
-            end
             if CoreFills::METHODS_RETURNING_SUBTYPES.include?(p.path) && !context.subtypes.empty?
-              next Solargraph::Pin::Method.new(p.location, p.namespace, p.name, "@return [#{context.subtypes.first.tag}]", p.scope, p.visibility, p.parameters, p.node)
+              next Solargraph::Pin::Method.new(
+                location: p.location,
+                closure: p.closure,
+                name: p.name,
+                comments: "@return [#{context.subtypes.first.tag}]",
+                scope: p.scope,
+                visibility: p.visibility,
+                args: p.parameters,
+                node: p.node
+              )
+            end
+            if CoreFills::METHODS_RETURNING_VALUE_TYPES.include?(p.path) && !context.value_types.empty?
+              next Solargraph::Pin::Method.new(
+                location: p.location,
+                closure: p.closure,
+                name: p.name,
+                comments: "@return [#{context.value_types.first.tag}]",
+                scope: p.scope,
+                visibility: p.visibility,
+                args: p.parameters,
+                node: p.node
+              )
             end
             if p.kind == Pin::METHOD && !p.macros.empty?
               result = process_macro(p, api_map, context, locals)
@@ -57,18 +61,13 @@ module Solargraph
               result = process_directive(p, api_map, context, locals)
               next result unless result.return_type.undefined?
             end
-            next p if p.kind == Pin::METHOD || p.kind == Pin::ATTRIBUTE || p.kind == Pin::NAMESPACE
-            # type = p.infer(api_map)
-            type = p.typify(api_map)
-            type = p.probe(api_map) if type.undefined?
-            next p if p.return_complex_type == type
-            p.proxy type
+            p
+          end
+          result.map do |pin|
+            next pin if pin.return_type.undefined?
+            selfy = pin.return_type.self_to(context.namespace)
+            selfy == pin.return_type ? pin : pin.proxy(selfy)
           end
-          result
-        end
-
-        def external_constructor? pin, context
-          pin.path == 'Class#new' || (pin.name == 'new' && pin.scope == :class && pin.docstring.tag(:return).nil?)
         end
 
         # @param pin [Pin::Method]
@@ -80,7 +79,7 @@ module Solargraph
             result = inner_process_macro(pin, macro, api_map, context, locals)
             return result unless result.return_type.undefined?
           end
-          Pin::ProxyType.new(nil, nil, nil, ComplexType::UNDEFINED)
+          Pin::ProxyType.anonymous(ComplexType::UNDEFINED)
         end
 
         def process_directive pin, api_map, context, locals
@@ -90,7 +89,7 @@ module Solargraph
             result = inner_process_macro(pin, macro, api_map, context, locals)
             return result unless result.return_type.undefined?
           end
-          Pin::ProxyType.new(nil, nil, nil, ComplexType::UNDEFINED)
+          Pin::ProxyType.anonymous ComplexType::UNDEFINED
         end
 
         def inner_process_macro pin, macro, api_map, context, locals
@@ -106,7 +105,7 @@ module Solargraph
           unless tag.nil? || tag.types.nil?
             return Pin::ProxyType.anonymous(ComplexType.try_parse(*tag.types))
           end
-          Pin::ProxyType.new(nil, nil, nil, ComplexType::UNDEFINED)
+          Pin::ProxyType.anonymous(ComplexType::UNDEFINED)
         end
       end
     end

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

@@ -12,7 +12,7 @@ module Solargraph
             context = ''
             bottom = word[2..-1]
           else
-            context = name_pin.context.namespace
+            context = name_pin.full_context.namespace
             bottom = word
           end
           if bottom.include?('::')

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

@@ -7,24 +7,18 @@ module Solargraph
       # @note Chain::Head is only intended to handle `self` and `super`.
       class Head < Link
         def resolve api_map, name_pin, locals
-          return [self_pin(name_pin.context)] if word == 'self'
+          return [name_pin] if word == 'self'
           return super_pins(api_map, name_pin) if word == 'super'
           []
         end
 
         private
 
-        # @param context [ComplexType]
-        # @return [Pin::ProxyType]
-        def self_pin(context)
-          Pin::ProxyType.anonymous(context)
-        end
-
         # @param api_map [ApiMap]
         # @param name_pin [Pin::Base]
         # @return [Array<Pin::Base>]
         def super_pins api_map, name_pin
-          pins = api_map.get_method_stack(name_pin.namespace, name_pin.name, scope: name_pin.context.scope)
+          pins = api_map.get_method_stack(name_pin.namespace, name_pin.name, scope: name_pin.scope)
           pins.reject{|p| p.path == name_pin.path}
         end
       end

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

@@ -3,7 +3,7 @@ module Solargraph
     class Chain
       class InstanceVariable < Link
         def resolve api_map, name_pin, locals
-          api_map.get_instance_variable_pins(name_pin.context.namespace, name_pin.context.scope).select{|p| p.name == word}
+          api_map.get_instance_variable_pins(name_pin.binder.namespace, name_pin.binder.scope).select{|p| p.name == word}
         end
       end
     end

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

@@ -4,6 +4,8 @@ module Solargraph
       class Link
         attr_reader :word
 
+        attr_accessor :last_context
+
         def initialize word = '<undefined>'
           @word = word
         end

data/lib/solargraph/source/cursor.rb

@@ -55,6 +55,7 @@ module Solargraph
         end
       end
 
+      # @return [Boolean]
       def start_of_constant?
         source.code[offset-2, 2] == '::'
       end
@@ -75,9 +76,19 @@ module Solargraph
         @chain ||= SourceChainer.chain(source, position)
       end
 
+      # True if the statement at the cursor is an argument to a previous
+      # method.
+      #
+      # Given the code `process(foo)`, a cursor pointing at `foo` would
+      # identify it as an argument being passed to the `process` method.
+      #
+      # If #argument? is true, the #recipient method will return a cursor that
+      # points to the method receiving the argument.
+      #
       # @return [Boolean]
       def argument?
-        @argument ||= !signature_position.nil?
+        # @argument ||= !signature_position.nil?
+        @argument ||= !recipient.nil?
       end
 
       # @return [Boolean]
@@ -90,12 +101,28 @@ module Solargraph
         @string ||= source.string_at?(position)
       end
 
+      # Get a cursor pointing to the method that receives the current statement
+      # as an argument.
+      #
       # @return [Cursor, nil]
       def recipient
-        return nil unless argument?
-        @recipient ||= Cursor.new(source, signature_position)
+        @recipient ||= begin
+          result = nil
+          node = recipient_node
+          unless node.nil?
+            result = if node.children[1].is_a?(AST::Node)
+                       pos = Range.from_node(node.children[1]).start
+                       Cursor.new(source, Position.new(pos.line, pos.column - 1))
+                     else
+                       Cursor.new(source, Range.from_node(node).ending)
+                     end
+          end
+          result
+        end
       end
+      alias receiver recipient
 
+      # @return [Position]
       def node_position
         @node_position ||= begin
           if start_of_word.empty?
@@ -111,6 +138,22 @@ module Solargraph
         end
       end
 
+      # @return [Parser::AST::Node, nil]
+      def recipient_node
+        return nil if source.code[offset-1] == ')' || source.code[0..offset] =~ /[^,][ \t]*?\n[ \t]*?\Z/
+        return nil if first_char_offset < offset && source.code[first_char_offset..offset-1] =~ /\)[\s]*\Z/
+        pos = Position.from_offset(source.code, first_char_offset)
+        tree = source.tree_at(pos.line, pos.character)
+        if tree[0] && tree[0].type == :send
+          rng = Range.from_node(tree[0])
+          return tree[0] if (rng.contain?(position) || offset + 1 == Position.to_offset(source.code, rng.ending)) && source.code[offset] =~ /[ \t\)\,'")]/
+          return tree[0] if (source.code[0..offset-1] =~ /\([\s]*\Z/ || source.code[0..offset-1] =~ /[a-z0-9_][ \t]+\Z/i)
+        end
+        return tree[1] if tree[1] && tree[1].type == :send
+        return tree[3] if tree[1] && tree[3] && tree[1].type == :pair && tree[3].type == :send
+        nil
+      end
+
       private
 
       # @return [Integer]
@@ -118,6 +161,19 @@ module Solargraph
         @offset ||= Position.to_offset(source.code, position)
       end
 
+      # @return [Integer]
+      def first_char_offset
+        @first_char_position ||= begin
+          if source.code[offset - 1] == ')'
+            position
+          else
+            index = offset - 1
+            index -= 1 while index > 0 && source.code[index].strip.empty?
+            index
+          end
+        end
+      end
+
       # A regular expression to find the start of a word from an offset.
       #
       # @return [Regexp]
@@ -131,27 +187,6 @@ module Solargraph
       def end_word_pattern
         /^([a-z0-9_]|[^\u0000-\u007F])*[\?\!]?/i
       end
-
-      def signature_position
-        if @signature_position.nil?
-          open_parens = 0
-          cursor = offset - 1
-          while cursor >= 0
-            break if cursor < 0
-            if source.code[cursor] == ')'
-              open_parens -= 1
-            elsif source.code[cursor] == '('
-              open_parens += 1
-            end
-            break if open_parens == 1
-            cursor -= 1
-          end
-          if cursor >= 0
-            @signature_position = Position.from_offset(source.code, cursor)
-          end
-        end
-        @signature_position
-      end
     end
   end
 end

data/lib/solargraph/source/node_chainer.rb

@@ -43,8 +43,6 @@ module Solargraph
       def generate_links n
         return [] unless n.is_a?(Parser::AST::Node)
         return generate_links(n.children[0]) if n.type == :begin
-        # @todo This might not be right. It's weird either way.
-        # return generate_links(n.children[2] || n.children[0]) if n.type == :block
         result = []
         if n.type == :block
           result.concat generate_links(n.children[0])

data/lib/solargraph/source/node_methods.rb

@@ -52,7 +52,7 @@ module Solargraph
       # @return [String]
       def infer_literal_node_type node
         return nil unless node.kind_of?(AST::Node)
-        if node.type == :str or node.type == :dstr
+        if node.type == :str || node.type == :dstr
           return 'String'
         elsif node.type == :array
           return 'Array'
@@ -66,7 +66,7 @@ module Solargraph
           return 'Symbol'
         elsif node.type == :regexp
           return 'Regexp'
-        # @todo Maybe ignore nils
+        # @todo Support `nil` keyword in types
         # elsif node.type == :nil
         #   return 'NilClass'
         end
@@ -142,7 +142,7 @@ module Solargraph
         class << self
           CONDITIONAL = [:if, :unless]
           REDUCEABLE = [:begin, :kwbegin]
-          SKIPPABLE = [:def, :defs, :class, :sclass, :module]
+          SKIPPABLE = [:def, :defs, :class, :sclass, :module, :block]
 
           # @param node [Parser::AST::Node]
           # @return [Array<Parser::AST::Node>]
@@ -157,6 +157,8 @@ module Solargraph
               result.concat reduce_to_value_nodes(node.children)
             elsif node.type == :return
               result.concat reduce_to_value_nodes([node.children[0]])
+            elsif node.type == :block
+              result.concat reduce_to_value_nodes(node.children[0..-2])
             else
               result.push node
             end
@@ -184,8 +186,9 @@ module Solargraph
           end
 
           def get_return_nodes_only parent
+            return [] unless parent.is_a?(Parser::AST::Node)
             result = []
-            nodes = parent.children.select{|n| n.is_a?(AST::Node)}
+            nodes = parent.children.select{|n| n.is_a?(Parser::AST::Node)}
             nodes.each do |node|
               next if SKIPPABLE.include?(node.type)
               if node.type == :return
@@ -203,8 +206,9 @@ module Solargraph
           def reduce_to_value_nodes nodes
             result = []
             nodes.each do |node|
-              next unless node.is_a?(Parser::AST::Node)
-              if REDUCEABLE.include?(node.type)
+              if !node.is_a?(Parser::AST::Node)
+                result.push nil
+              elsif REDUCEABLE.include?(node.type)
                 result.concat get_return_nodes_from_children(node)
               elsif CONDITIONAL.include?(node.type)
                 result.concat reduce_to_value_nodes(node.children[1..-1])
@@ -212,6 +216,8 @@ module Solargraph
                 result.concat get_return_nodes(node.children[0])
               elsif node.type == :and || node.type == :or
                 result.concat reduce_to_value_nodes(node.children)
+              elsif node.type == :block
+                result.concat get_return_nodes_only(node.children[2])
               else
                 result.push node
               end

data/lib/solargraph/source/source_chainer.rb

@@ -67,7 +67,7 @@ module Solargraph
 
       # @return [String]
       def phrase
-        @phrase ||= source.code[signature_data[0]..offset-1]
+        @phrase ||= source.code[signature_data..offset-1]
       end
 
       # @return [String]
@@ -120,63 +120,57 @@ module Solargraph
         brackets = 0
         squares = 0
         parens = 0
-        signature = ''
         index -=1
         in_whitespace = false
         while index >= 0
           pos = Position.from_offset(@source.code, index)
           break if index > 0 and @source.comment_at?(pos)
-          unless !in_whitespace and string?
-            break if brackets > 0 or parens > 0 or squares > 0
-            char = @source.code[index, 1]
-            break if char.nil? # @todo Is this the right way to handle this?
-            if brackets.zero? and parens.zero? and squares.zero? and [' ', "\r", "\n", "\t"].include?(char)
-              in_whitespace = true
-            else
-              if brackets.zero? and parens.zero? and squares.zero? and in_whitespace
-                unless char == '.' or @source.code[index+1..-1].strip.start_with?('.')
-                  old = @source.code[index+1..-1]
-                  nxt = @source.code[index+1..-1].lstrip
-                  index += (@source.code[index+1..-1].length - @source.code[index+1..-1].lstrip.length)
-                  break
-                end
-              end
-              if char == ')'
-                parens -=1
-              elsif char == ']'
-                squares -=1
-              elsif char == '}'
-                brackets -= 1
-              elsif char == '('
-                parens += 1
-              elsif char == '{'
-                brackets += 1
-              elsif char == '['
-                squares += 1
-                signature = ".[]#{signature}" if parens.zero? and brackets.zero? and squares.zero? and @source.code[index-2] != '%'
+          break if brackets > 0 or parens > 0 or squares > 0
+          char = @source.code[index, 1]
+          break if char.nil? # @todo Is this the right way to handle this?
+          if brackets.zero? and parens.zero? and squares.zero? and [' ', "\r", "\n", "\t"].include?(char)
+            in_whitespace = true
+          else
+            if brackets.zero? and parens.zero? and squares.zero? and in_whitespace
+              unless char == '.' or @source.code[index+1..-1].strip.start_with?('.')
+                old = @source.code[index+1..-1]
+                nxt = @source.code[index+1..-1].lstrip
+                index += (@source.code[index+1..-1].length - @source.code[index+1..-1].lstrip.length)
+                break
               end
-              if brackets.zero? and parens.zero? and squares.zero?
-                break if ['"', "'", ',', ';', '%'].include?(char)
-                break if !signature.empty? && ['!', '?'].include?(char)
-                signature = char + signature if char.match(/[a-z0-9:\._@\$\?\!]/i) and @source.code[index - 1] != '%'
-                break if char == '$'
-                if char == '@'
+            end
+            if char == ')'
+              parens -=1
+            elsif char == ']'
+              squares -=1
+            elsif char == '}'
+              brackets -= 1
+            elsif char == '('
+              parens += 1
+            elsif char == '{'
+              brackets += 1
+            elsif char == '['
+              squares += 1
+            end
+            if brackets.zero? and parens.zero? and squares.zero?
+              break if ['"', "'", ',', ';', '%'].include?(char)
+              break if ['!', '?'].include?(char) && index < offset - 1
+              break if char == '$'
+              if char == '@'
+                index -= 1
+                if @source.code[index, 1] == '@'
                   index -= 1
-                  if @source.code[index, 1] == '@'
-                    index -= 1
-                    signature = "@#{signature}"
-                  end
-                  break
                 end
-              elsif parens == 1 || brackets == 1 || squares == 1
                 break
               end
-              in_whitespace = false
+            elsif parens == 1 || brackets == 1 || squares == 1
+              break
             end
+            in_whitespace = false
           end
           index -= 1
         end
-        [index + 1, signature]
+        index + 1
       end
     end
   end