solargraph 0.54.4 → 0.58.3

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,89 +1,26 @@
-# 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 = crawl_gates(name_pin)
-          end
-          parts = base.split('::')
-          gates.each do |gate|
-            # @todo 'Wrong argument type for
-            #   Solargraph::Source::Chain::Constant#deep_constant_type:
-            #   gate expected String, received generic<Elem>' is because
-            #   we lose 'rooted' information in the 'Chain::Array' class
-            #   internally, leaving ::Array#each shadowed when it
-            #   shouldn't be.
-            type = deep_constant_type(gate, api_map)
-            # Use deep inference to resolve root
-            parts[0..-2].each do |sym|
-              pins = api_map.get_constants('', type.namespace).select{ |pin| pin.name == sym }
-              type = first_pin_type(pins, api_map)
-              break if type.undefined?
-            end
-            next if type.undefined?
-            result = api_map.get_constants('', type.namespace).select { |pin| pin.name == parts.last }
-            return result unless result.empty?
-          end
-          []
-        end
-
-        private
-
-        # @param pin [Pin::Base]
-        # @return [::Array<String>]
-        def crawl_gates pin
-          clos = pin
-          until clos.nil?
-            if clos.is_a?(Pin::Namespace)
-              gates = clos.gates
-              gates.push('') if gates.empty?
-              return gates
-            end
-            clos = clos.closure
-          end
-          ['']
-        end
-
-        # @param pins [::Array<Pin::Base>]
-        # @param api_map [ApiMap]
-        # @return [ComplexType]
-        def first_pin_type(pins, api_map)
-          type = ComplexType::UNDEFINED
-          pins.each do |pin|
-            type = pin.typify(api_map)
-            break if type.defined?
-            type = pin.probe(api_map)
-            break if type.defined?
-          end
-          type
-        end
-
-        # @param gate [String]
-        # @param api_map [ApiMap]
-        # @return [ComplexType]
-        def deep_constant_type(gate, api_map)
-          type = ComplexType::ROOT
-          return type if gate == ''
-          gate.split('::').each do |word|
-            pins = api_map.get_constants('', type.namespace).select { |pin| pin.name == word }
-            type = first_pin_type(pins, api_map)
-            break if type.undefined?
-          end
-          type
-        end
-      end
-    end
-  end
-end
+# 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

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,33 +1,34 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Hash < Literal
-        # @param type [String]
-        # @param splatted [Boolean]
-        def initialize type, splatted = false
-          super(type)
-          @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)]
-        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
+
+        # @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

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

@@ -9,7 +9,7 @@ module Solargraph
       # @note Chain::Head is only intended to handle `self` and `super`.
       class Head < Link
         def resolve api_map, name_pin, locals
-          return [Pin::ProxyType.anonymous(name_pin.binder)] if word == 'self'
+          return [Pin::ProxyType.anonymous(name_pin.binder, source: :chain)] if word == 'self'
           # return super_pins(api_map, name_pin) if word == 'super'
           []
         end

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

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class If < Link
-        def word
-          '<if>'
-        end
-
-        # @param links [::Array<Link>]
-        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(', ')))]
-        end
-      end
-    end
-  end
-end
+# 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

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

@@ -1,13 +1,13 @@
-# 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
+        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

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

@@ -1,98 +1,109 @@
-# 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 Fix "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 [::Enumerable<Pin::Base>]
-        # @return [::Array<Pin::Base>]
-        def resolve api_map, name_pin, locals
-          []
-        end
-
-        # debugging description of contents; not for machine use
-        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
-        def desc
-          word
-        end
-
-        def inspect
-          "#<#{self.class} - `#{self.desc}`>"
-        end
-
-        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
+
+        # @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

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

@@ -1,28 +1,48 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Literal < Link
-        def word
-          @word ||= "<#{@type}>"
-        end
-
-        # @param type [String]
-        def initialize type
-          @type = type
-          @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
-          [Pin::ProxyType.anonymous(@complex_type)]
-        end
-      end
-    end
-  end
-end
+# 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

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

@@ -1,23 +1,23 @@
-# frozen_string_literal: true
-
-module Solargraph
-  class Source
-    class Chain
-      class Or < Link
-        def word
-          '<or>'
-        end
-
-        # @param links [::Array<Link>]
-        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))]
-        end
-      end
-    end
-  end
-end
+# 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