solargraph 0.58.0 → 0.59.0

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

@@ -1,26 +1,30 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Constant < Link
-        def initialize word
-          @word = word
-        end
-
-        def resolve api_map, name_pin, locals
-          return [Pin::ROOT_PIN] if word.empty?
-          if word.start_with?('::')
-            base = word[2..-1]
-            gates = ['']
-          else
-            base = word
-            gates = name_pin.gates
-          end
-          fqns = api_map.resolve(base, gates)
-          api_map.get_path_pins(fqns)
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      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..]
+            gates = ['']
+          else
+            base = word
+            gates = name_pin.gates
+          end
+          # @sg-ignore Need to add nil check here
+          fqns = api_map.resolve(base, gates)
+          # @sg-ignore Need to add nil check here
+          api_map.get_path_pins(fqns)
+        end
+      end
+    end
+  end
+end

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

@@ -1,34 +1,37 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Hash < Literal
-        # @param type [String]
-        # @param node [Parser::AST::Node]
-        # @param splatted [Boolean]
-        def initialize type, node, splatted = false
-          super(type, node)
-          @splatted = splatted
-        end
-
-        # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
-          super + [@splatted]
-        end
-
-        def word
-          @word ||= "<#{@type}>"
-        end
-
-        def resolve api_map, name_pin, locals
-          [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
-        end
-
-        def splatted?
-          @splatted
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Hash < Literal
+        # @param type [String]
+        # @param node [Parser::AST::Node]
+        # @param splatted [Boolean]
+        def initialize type, node, splatted = false
+          super(type, node)
+          @splatted = splatted
+        end
+
+        def word
+          @word ||= "<#{@type}>"
+        end
+
+        def resolve api_map, name_pin, locals
+          [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
+        end
+
+        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
+end

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

@@ -1,28 +1,30 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class If < Link
-        def word
-          '<if>'
-        end
-
-        # @param links [::Array<Chain>]
-        def initialize links
-          @links = links
-        end
-
-        # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
-          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
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class If < Link
+        # @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"
+        def equality_fields
+          # @sg-ignore literal arrays in this module turn into ::Solargraph::Source::Chain::Array
+          super + [@links]
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,36 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class InstanceVariable < Link
-        def resolve api_map, name_pin, locals
-          api_map.get_instance_variable_pins(name_pin.binder.namespace, name_pin.binder.scope).select{|p| p.name == word}
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class InstanceVariable < Link
+        # @param word [String]
+        # @param node [Parser::AST::Node, nil] The node representing the variable
+        # @param location [Location, nil] The location of the variable reference in the source
+        def initialize word, node, location
+          super(word)
+          @node = node
+          @location = location
+        end
+
+        # @sg-ignore Declared return type
+        #   ::Array<::Solargraph::Pin::Base> does not match inferred
+        #   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 do |p|
+            p.name == word
+          end
+          out = api_map.var_at_location(ivars, word, name_pin, location)
+          [out].compact
+        end
+
+        private
+
+        # @todo: Missed nil violation
+        # @return [Location]
+        attr_reader :location
+      end
+    end
+  end
+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

@@ -1,48 +1,51 @@
-# frozen_string_literal: true
-
-require 'parser'
-
-module Solargraph
-  class Source
-    class Chain
-      class Literal < Link
-        def word
-          @word ||= "<#{@type}>"
-        end
-
-        attr_reader :value
-
-        # @param type [String]
-        # @param node [Parser::AST::Node, Object]
-        def initialize type, node
-          if node.is_a?(::Parser::AST::Node)
-            if node.type == :true
-              @value = true
-            elsif node.type == :false
-              @value = false
-            elsif [:int, :sym].include?(node.type)
-              @value = node.children.first
-            end
-          end
-          @type = type
-          @literal_type = ComplexType.try_parse(@value.inspect)
-          @complex_type = ComplexType.try_parse(type)
-        end
-
-        # @sg-ignore Fix "Not enough arguments to Module#protected"
-        protected def equality_fields
-          super + [@value, @type, @literal_type, @complex_type]
-        end
-
-        def resolve api_map, name_pin, locals
-          if api_map.super_and_sub?(@complex_type.name, @literal_type.name)
-            [Pin::ProxyType.anonymous(@literal_type, source: :chain)]
-          else
-            # we don't support this value as a literal type
-            [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'parser'
+
+module Solargraph
+  class Source
+    class Chain
+      class Literal < Link
+        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
+              @value = true
+            # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
+            elsif node.type == :false
+              @value = false
+            # @sg-ignore flow sensitive typing needs to narrow down type with an if is_a? check
+            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
+          end
+          @type = type
+          @literal_type = ComplexType.try_parse(@value.inspect)
+          @complex_type = ComplexType.try_parse(type)
+        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 + [@value, @type, @literal_type, @complex_type]
+        end
+
+        def resolve api_map, name_pin, locals
+          if api_map.super_and_sub?(@complex_type.name, @literal_type.name)
+            [Pin::ProxyType.anonymous(@literal_type, source: :chain)]
+          else
+            # we don't support this value as a literal type
+            [Pin::ProxyType.anonymous(@complex_type, source: :chain)]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,23 +1,29 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Or < Link
-        def word
-          '<or>'
-        end
-
-        # @param links [::Array<Chain>]
-        def initialize links
-          @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.new(types.uniq), source: :chain)]
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Solargraph
+  class Source
+    class Chain
+      class Or < Link
+        attr_reader :links
+
+        # @param links [::Array<Chain>]
+        def initialize links
+          super('<or>')
+
+          @links = links
+        end
+
+        def resolve api_map, name_pin, locals
+          types = @links.map { |link| link.infer(api_map, name_pin, locals) }
+          combined_type = Solargraph::ComplexType.new(types)
+          unless types.all?(&:nullable?)
+            # @sg-ignore flow sensitive typing should be able to handle redefinition
+            combined_type = combined_type.without_nil
+          end
+
+          [Solargraph::Pin::ProxyType.anonymous(combined_type, source: :chain)]
+        end
+      end
+    end
+  end
+end