solargraph 0.59.0.dev.1 → 0.59.0.dev.2

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

@@ -28,19 +28,14 @@ module Solargraph
         # @param arguments [::Array<Chain>]
         # @param block [Chain, nil]
         def initialize word, location = nil, arguments = [], block = nil
-          @word = word
+          super(word)
+
           @location = location
           @arguments = arguments
           @block = block
           fix_block_pass
         end
 
-        # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
-          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
-          super + [arguments, block]
-        end
-
         def with_block?
           !!@block
         end
@@ -68,10 +63,7 @@ module Solargraph
             stack = api_map.get_method_stack(ns_tag, word, scope: context.scope)
             [stack.first].compact
           end
-          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
-          if !api_map.loose_unions && pin_groups.any? { |pins| pins.empty? }
-            pin_groups = []
-          end
+          pin_groups = [] if !api_map.loose_unions && pin_groups.any?(&:empty?)
           pins = pin_groups.flatten.uniq(&:path)
           return [] if pins.empty?
           inferred_pins(pins, api_map, name_pin, locals)
@@ -128,38 +120,42 @@ module Solargraph
                 if ol.block && with_block?
                   block_atypes = ol.block.parameters.map(&:return_type)
                   # @todo Need to add nil check here
-                  if block.links.map(&:class) == [BlockSymbol]
-                    # like the bar in foo(&:bar)
-                    blocktype = block_symbol_call_type(api_map, name_pin.context, block_atypes, locals)
-                  else
-                    blocktype = block_call_type(api_map, name_pin, locals)
-                  end
+                  blocktype = if block.links.map(&:class) == [BlockSymbol]
+                                # like the bar in foo(&:bar)
+                                block_symbol_call_type(api_map, name_pin.context, block_atypes, locals)
+                              else
+                                block_call_type(api_map, name_pin, locals)
+                              end
                 end
                 # @type new_signature_pin [Pin::Signature]
-                new_signature_pin = ol.resolve_generics_from_context_until_complete(ol.generics, atypes, nil, nil, blocktype)
+                new_signature_pin = ol.resolve_generics_from_context_until_complete(ol.generics, atypes, nil, nil,
+                                                                                    blocktype)
                 new_return_type = new_signature_pin.return_type
-                if head?
-                  # If we're at the head of the chain, we called a
-                  # method somewhere that marked itself as returning
-                  # self.  Given we didn't invoke this on an object,
-                  # this must be a method in this same class - so we
-                  # use our own self type
-                  self_type = name_pin.context
-                else
-                  # if we're past the head in the chain, whatever the
-                  # type of the lhs side is what 'self' will be in its
-                  # declaration - we can't just use the type of the
-                  # method pin, as this might be a subclass of the
-                  # place where the method is defined
-                  self_type = name_pin.binder
-                end
+                self_type = if head?
+                              # If we're at the head of the chain, we called a
+                              # method somewhere that marked itself as returning
+                              # self.  Given we didn't invoke this on an object,
+                              # this must be a method in this same class - so we
+                              # use our own self type
+                              name_pin.context
+                            else
+                              # if we're past the head in the chain, whatever the
+                              # type of the lhs side is what 'self' will be in its
+                              # declaration - we can't just use the type of the
+                              # method pin, as this might be a subclass of the
+                              # place where the method is defined
+                              name_pin.binder
+                            end
                 # This same logic applies to the YARD work done by
                 # 'with_params()'.
                 #
                 # qualify(), however, happens in the namespace where
                 # the docs were written - from the method pin.
                 # @todo Need to add nil check here
-                type = with_params(new_return_type.self_to_type(self_type), self_type).qualify(api_map, *p.gates) if new_return_type.defined?
+                if new_return_type.defined?
+                  type = with_params(new_return_type.self_to_type(self_type), self_type).qualify(api_map,
+                                                                                                 *p.gates)
+                end
                 type ||= ComplexType::UNDEFINED
               end
               break if type.defined?
@@ -177,8 +173,10 @@ module Solargraph
             end
             p
           end
-          logger.debug { "Call#inferred_pins(name_pin.binder=#{name_pin.binder}, word=#{word}, pins=#{pins.map(&:desc)}, name_pin=#{name_pin}) - result=#{result}" }
-          out = result.map do |pin|
+          logger.debug do
+            "Call#inferred_pins(name_pin.binder=#{name_pin.binder}, word=#{word}, pins=#{pins.map(&:desc)}, name_pin=#{name_pin}) - result=#{result}"
+          end
+          result.map do |pin|
             if pin.path == 'Class#new' && name_pin.binder.tag != 'Class'
               reduced_context = name_pin.binder.reduce_class_type
               pin.proxy(reduced_context)
@@ -234,7 +232,7 @@ module Solargraph
         # @param locals [::Array<Pin::LocalVariable, Pin::Parameter>]
         # @return [Pin::ProxyType]
         def inner_process_macro pin, macro, api_map, context, locals
-          vals = arguments.map{ |c| Pin::ProxyType.anonymous(c.infer(api_map, pin, locals), source: :chain) }
+          vals = arguments.map { |c| Pin::ProxyType.anonymous(c.infer(api_map, pin, locals), source: :chain) }
           txt = macro.tag.text.clone
           # @sg-ignore Need to add nil check here
           if txt.empty? && macro.tag.name
@@ -260,7 +258,7 @@ module Solargraph
         # @param context [ComplexType]
         # @return [ComplexType, nil]
         def extra_return_type docstring, context
-          if docstring.has_tag?('return_single_parameter') #&& context.subtypes.one?
+          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
@@ -270,7 +268,7 @@ module Solargraph
 
         # @param name_pin [Pin::Base]
         # @return [Pin::Method, nil]
-        def find_method_pin(name_pin)
+        def find_method_pin name_pin
           method_pin = name_pin
           until method_pin.is_a?(Pin::Method)
             # @sg-ignore Need to support this in flow sensitive typing
@@ -287,7 +285,7 @@ module Solargraph
           method_pin = find_method_pin(name_pin)
           return [] if method_pin.nil?
           pins = api_map.get_method_stack(method_pin.namespace, method_pin.name, scope: method_pin.context.scope)
-          pins.reject{|p| p.path == name_pin.path}
+          pins.reject { |p| p.path == name_pin.path }
         end
 
         # @param api_map [ApiMap]
@@ -324,7 +322,7 @@ module Solargraph
         # @param block_parameter_types [::Array<ComplexType>]
         # @param locals [::Array<Pin::LocalVariable>]
         # @return [ComplexType, nil]
-        def block_symbol_call_type(api_map, context, block_parameter_types, locals)
+        def block_symbol_call_type api_map, context, block_parameter_types, locals
           # Ruby's shorthand for sending the passed in method name
           # to the first yield parameter with no arguments
           # @sg-ignore Need to add nil check here
@@ -342,7 +340,7 @@ module Solargraph
 
         # @param api_map [ApiMap]
         # @return [Pin::Block, nil]
-        def find_block_pin(api_map)
+        def find_block_pin api_map
           # @sg-ignore Need to add nil check here
           node_location = Solargraph::Location.from_node(block.node)
           return if node_location.nil?
@@ -353,10 +351,9 @@ module Solargraph
 
         # @param api_map [ApiMap]
         # @param name_pin [Pin::Base]
-        # @param block_parameter_types [::Array<ComplexType>]
         # @param locals [::Array<Pin::LocalVariable>]
         # @return [ComplexType, nil]
-        def block_call_type(api_map, name_pin, locals)
+        def block_call_type api_map, name_pin, locals
           return nil unless with_block?
 
           block_pin = find_block_pin(api_map)
@@ -366,6 +363,14 @@ module Solargraph
           # @sg-ignore Need to add nil check here
           block.infer(api_map, block_pin, locals)
         end
+
+        protected
+
+        # @sg-ignore Fix "Not enough arguments to Module#protected"
+        def equality_fields
+          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
+          super + [arguments, block]
+        end
       end
     end
   end

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

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class ClassVariable < Link
-        def resolve api_map, name_pin, locals
-          api_map.get_class_variable_pins(name_pin.context.namespace).select{|p| p.name == word}
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class ClassVariable < Link
+        def resolve api_map, name_pin, locals
+          api_map.get_class_variable_pins(name_pin.context.namespace).select { |p| p.name == word }
+        end
+      end
+    end
+  end
+end

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

@@ -6,12 +6,14 @@ module Solargraph
       class Constant < Link
         def initialize word
           @word = word
+
+          super
         end
 
         def resolve api_map, name_pin, locals
           return [Pin::ROOT_PIN] if word.empty?
           if word.start_with?('::')
-            base = word[2..-1]
+            base = word[2..]
             gates = ['']
           else
             base = word

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

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class GlobalVariable < Link
-        def resolve api_map, name_pin, locals
-          api_map.get_global_variable_pins.select{|p| p.name == word}
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class GlobalVariable < Link
+        def resolve api_map, name_pin, locals
+          api_map.get_global_variable_pins.select { |p| p.name == word }
+        end
+      end
+    end
+  end
+end

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

@@ -12,12 +12,6 @@ module Solargraph
           @splatted = splatted
         end
 
-        # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
-          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
-          super + [@splatted]
-        end
-
         def word
           @word ||= "<#{@type}>"
         end
@@ -29,6 +23,14 @@ module Solargraph
         def splatted?
           @splatted
         end
+
+        protected
+
+        # @sg-ignore Fix "Not enough arguments to Module#protected"
+        def equality_fields
+          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
+          super + [@splatted]
+        end
       end
     end
   end

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

@@ -4,25 +4,26 @@ module Solargraph
   class Source
     class Chain
       class If < Link
-        def word
-          '<if>'
-        end
-
         # @param links [::Array<Chain>]
         def initialize links
+          super('<if>')
+
           @links = links
         end
 
+        def resolve api_map, name_pin, locals
+          types = @links.map { |link| link.infer(api_map, name_pin, locals) }
+          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.try_parse(types.map(&:tag).uniq.join(', ')),
+                                                source: :chain)]
+        end
+
+        protected
+
         # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
+        def equality_fields
           # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
           super + [@links]
         end
-
-        def resolve api_map, name_pin, locals
-          types = @links.map { |link| link.infer(api_map, name_pin, locals) }
-          [Solargraph::Pin::ProxyType.anonymous(Solargraph::ComplexType.try_parse(types.map(&:tag).uniq.join(', ')), source: :chain)]
-        end
       end
     end
   end

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

@@ -18,7 +18,9 @@ module Solargraph
         #   type ::Array<::Solargraph::Pin::BaseVariable, ::NilClass>
         #   for Solargraph::Source::Chain::InstanceVariable#resolve
         def resolve api_map, name_pin, locals
-          ivars = api_map.get_instance_variable_pins(name_pin.context.namespace, name_pin.context.scope).select{|p| p.name == word}
+          ivars = api_map.get_instance_variable_pins(name_pin.context.namespace, name_pin.context.scope).select do |p|
+            p.name == word
+          end
           out = api_map.var_at_location(ivars, word, name_pin, location)
           [out].compact
         end

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

@@ -1,109 +1,99 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Link
-        include Equality
-
-        # @return [String]
-        attr_reader :word
-
-        # @return [Pin::Base]
-        attr_accessor :last_context
-
-        # @param word [String]
-        def initialize word = '<undefined>'
-          @word = word
-        end
-
-        # @sg-ignore two problems - Declared return type
-        #   ::Solargraph::Source::Chain::Array does not match inferred
-        #   type ::Array(::Class<::Solargraph::Source::Chain::Link>,
-        #   ::String) for
-        #   Solargraph::Source::Chain::Link#equality_fields
-        #   and
-        #   Not enough arguments to Module#protected
-        protected def equality_fields
-          [self.class, word]
-        end
-
-        def undefined?
-          word == '<undefined>'
-        end
-
-        def constant?
-          is_a?(Chain::Constant)
-        end
-
-        # @param api_map [ApiMap]
-        # @param name_pin [Pin::Base]
-        # @param locals [::Array<Pin::Base>]
-        # @return [::Array<Pin::Base>]
-        def resolve api_map, name_pin, locals
-          []
-        end
-
-        # debugging description of contents; not for machine use
-        # @return [String]
-        def desc
-          word
-        end
-
-        def to_s
-          desc
-        end
-
-        def inspect
-          "#<#{self.class} - `#{self.desc}`>"
-        end
-
-        def head?
-          @head ||= false
-        end
-
-        # Make a copy of this link marked as the head of a chain
-        #
-        # @return [self]
-        def clone_head
-          clone.mark_head(true)
-        end
-
-        # Make a copy of this link unmarked as the head of a chain
-        #
-        # @return [self]
-        def clone_body
-          clone.mark_head(false)
-        end
-
-        def nullable?
-          false
-        end
-
-        # debugging description of contents; not for machine use
-        #
-        # @return [String]
-        def desc
-          word
-        end
-
-        def inspect
-          "#<#{self.class} - `#{self.desc}`>"
-        end
-
-        include Logging
-
-        protected
-
-        # Mark whether this link is the head of a chain
-        #
-        # @param bool [Boolean]
-        # @return [self]
-        def mark_head bool
-          @head = bool
-          self
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Link
+        include Equality
+
+        # @return [String]
+        attr_reader :word
+
+        # @return [Pin::Base]
+        attr_accessor :last_context
+
+        # @param word [String]
+        def initialize word = '<undefined>'
+          @word = word
+        end
+
+        def undefined?
+          word == '<undefined>'
+        end
+
+        def constant?
+          is_a?(Chain::Constant)
+        end
+
+        # @param api_map [ApiMap]
+        # @param name_pin [Pin::Base]
+        # @param locals [::Array<Pin::Base>]
+        # @return [::Array<Pin::Base>]
+        def resolve api_map, name_pin, locals
+          []
+        end
+
+        def to_s
+          desc
+        end
+
+        def inspect
+          "#<#{self.class} - `#{desc}`>"
+        end
+
+        def head?
+          @head ||= false
+        end
+
+        # Make a copy of this link marked as the head of a chain
+        #
+        # @return [self]
+        def clone_head
+          clone.mark_head(true)
+        end
+
+        # Make a copy of this link unmarked as the head of a chain
+        #
+        # @return [self]
+        def clone_body
+          clone.mark_head(false)
+        end
+
+        def nullable?
+          false
+        end
+
+        # debugging description of contents; not for machine use
+        #
+        # @return [String]
+        def desc
+          word
+        end
+
+        include Logging
+
+        protected
+
+        # @sg-ignore two problems - Declared return type
+        #   ::Solargraph::Source::Chain::Array does not match inferred
+        #   type ::Array(::Class<::Solargraph::Source::Chain::Link>,
+        #   ::String) for
+        #   Solargraph::Source::Chain::Link#equality_fields
+        #   and
+        #   Not enough arguments to Module#protected
+        def equality_fields
+          [self.class, word]
+        end
+
+        # Mark whether this link is the head of a chain
+        #
+        # @param bool [Boolean]
+        # @return [self]
+        def mark_head bool
+          @head = bool
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -6,15 +6,13 @@ module Solargraph
   class Source
     class Chain
       class Literal < Link
-        def word
-          @word ||= "<#{@type}>"
-        end
-
-        attr_reader :value
+        attr_reader :word, :value
 
         # @param type [String]
         # @param node [Parser::AST::Node, Object]
         def initialize type, node
+          super("<#{type}>")
+
           if node.is_a?(::Parser::AST::Node)
             # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
             if node.type == :true
@@ -23,7 +21,7 @@ module Solargraph
             elsif node.type == :false
               @value = false
             # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
-            elsif [:int, :sym].include?(node.type)
+            elsif %i[int sym].include?(node.type)
               # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
               @value = node.children.first
             end

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

@@ -4,14 +4,12 @@ module Solargraph
   class Source
     class Chain
       class Or < Link
-        def word
-          '<or>'
-        end
-
         attr_reader :links
 
         # @param links [::Array<Chain>]
         def initialize links
+          super('<or>')
+
           @links = links
         end
 

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

@@ -1,11 +1,13 @@
-module Solargraph
-  class Source
-    class Chain
-      class QCall < Call
-        def nullable?
-          true
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class QCall < Call
+        def nullable?
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,15 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Variable < 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}
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Variable < Link
+        def resolve api_map, name_pin, locals
+          api_map.get_instance_variable_pins(name_pin.context.namespace, name_pin.context.scope).select do |p|
+            p.name == word
+          end
+        end
+      end
+    end
+  end
+end