solargraph 0.32.1 → 0.32.2

data/lib/solargraph/pin/base_method.rb

@@ -1,76 +1,76 @@
-module Solargraph
-  module Pin
-    # The base class for method and attribute pins.
-    #
-    class BaseMethod < Base
-      # @return [Symbol] :instance or :class
-      attr_reader :scope
-
-      # @return [Symbol] :public, :private, or :protected
-      attr_reader :visibility
-
-      def return_complex_type
-        @return_complex_type ||= generate_complex_type
-      end
-
-      def typify api_map
-        decl = super
-        return decl unless decl.undefined?
-        type = see_reference(api_map)
-        return type unless type.nil?
-        ComplexType::UNDEFINED
-      end
-
-      private
-
-      # @return [ComplexType]
-      def generate_complex_type
-        tag = docstring.tag(:return)
-        if tag.nil?
-          ol = docstring.tag(:overload)
-          tag = ol.tag(:return) unless ol.nil?
-        end
-        return ComplexType::UNDEFINED if tag.nil? or tag.types.nil? or tag.types.empty?
-        ComplexType.try_parse *tag.types
-      end
-
-      # @param api_map [ApiMap]
-      # @return [ComplexType]
-      def see_reference api_map
-        docstring.ref_tags.each do |ref|
-          next unless ref.tag_name == 'return' && ref.owner
-          result = resolve_reference(ref.owner.to_s, api_map)
-          return result unless result.nil?
-        end
-        match = comments.match(/\(see (.*)\)/)
-        return nil if match.nil?
-        resolve_reference match[1], api_map
-      end
-
-      # @param ref [String]
-      # @param api_map [ApiMap]
-      # @return [ComplexType]
-      def resolve_reference ref, api_map
-        parts = ref.split(/[\.#]/)
-        if parts.first.empty?
-          path = "#{namespace}#{ref}"
-        else
-          fqns = api_map.qualify(parts.first, namespace)
-          return ComplexType::UNDEFINED if fqns.nil?
-          path = fqns + ref[parts.first.length] + parts.last
-        end
-        pins = api_map.get_path_pins(path)
-        pins.each do |pin|
-          type = pin.typify(api_map)
-          return type unless type.undefined?
-        end
-        pins = api_map.get_path_pins(path)
-        pins.each do |pin|
-          type = pin.typify(api_map)
-          return type unless type.undefined?
-        end
-        nil
-      end
-    end
-  end
-end
+module Solargraph
+  module Pin
+    # The base class for method and attribute pins.
+    #
+    class BaseMethod < Base
+      # @return [Symbol] :instance or :class
+      attr_reader :scope
+
+      # @return [Symbol] :public, :private, or :protected
+      attr_reader :visibility
+
+      def return_complex_type
+        @return_complex_type ||= generate_complex_type
+      end
+
+      def typify api_map
+        decl = super
+        return decl unless decl.undefined?
+        type = see_reference(api_map)
+        return type unless type.nil?
+        ComplexType::UNDEFINED
+      end
+
+      private
+
+      # @return [ComplexType]
+      def generate_complex_type
+        tag = docstring.tag(:return)
+        if tag.nil?
+          ol = docstring.tag(:overload)
+          tag = ol.tag(:return) unless ol.nil?
+        end
+        return ComplexType::UNDEFINED if tag.nil? or tag.types.nil? or tag.types.empty?
+        ComplexType.try_parse *tag.types
+      end
+
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def see_reference api_map
+        docstring.ref_tags.each do |ref|
+          next unless ref.tag_name == 'return' && ref.owner
+          result = resolve_reference(ref.owner.to_s, api_map)
+          return result unless result.nil?
+        end
+        match = comments.match(/\(see (.*)\)/)
+        return nil if match.nil?
+        resolve_reference match[1], api_map
+      end
+
+      # @param ref [String]
+      # @param api_map [ApiMap]
+      # @return [ComplexType]
+      def resolve_reference ref, api_map
+        parts = ref.split(/[\.#]/)
+        if parts.first.empty?
+          path = "#{namespace}#{ref}"
+        else
+          fqns = api_map.qualify(parts.first, namespace)
+          return ComplexType::UNDEFINED if fqns.nil?
+          path = fqns + ref[parts.first.length] + parts.last
+        end
+        pins = api_map.get_path_pins(path)
+        pins.each do |pin|
+          type = pin.typify(api_map)
+          return type unless type.undefined?
+        end
+        pins = api_map.get_path_pins(path)
+        pins.each do |pin|
+          type = pin.typify(api_map)
+          return type unless type.undefined?
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/solargraph/pin/base_variable.rb

@@ -1,72 +1,72 @@
-module Solargraph
-  module Pin
-    class BaseVariable < Base
-      include Solargraph::Source::NodeMethods
-
-      attr_reader :context
-
-      attr_reader :assignment
-
-      def initialize location, namespace, name, comments, assignment, literal, context
-        super(location, namespace, name, comments)
-        @assignment = assignment
-        @literal = literal
-        @context = context
-      end
-
-      def signature
-        @signature ||= resolve_node_signature(@assignment)
-      end
-
-      def completion_item_kind
-        Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
-      end
-
-      # @return [Integer]
-      def symbol_kind
-        Solargraph::LanguageServer::SymbolKinds::VARIABLE
-      end
-
-      def return_complex_type
-        @return_complex_type ||= generate_complex_type
-      end
-
-      def nil_assignment?
-        return_complex_type.nil?
-      end
-
-      def variable?
-        true
-      end
-
-      def probe api_map
-        return ComplexType::UNDEFINED if @assignment.nil?
-        chain = Source::NodeChainer.chain(@assignment, filename)
-        clip = api_map.clip_at(location.filename, location.range.start)
-        locals = clip.locals - [self]
-        chain.infer(api_map, ProxyType.anonymous(context), locals)
-      end
-
-      def == other
-        return false unless super
-        assignment == other.assignment
-      end
-
-      def try_merge! pin
-        return false unless super
-        @assignment = pin.assignment
-        @return_complex_type = pin.return_complex_type
-        true
-      end
-
-      private
-
-      def generate_complex_type
-        tag = docstring.tag(:type)
-        return ComplexType.try_parse(*tag.types) unless tag.nil? || tag.types.nil? || tag.types.empty?
-        return ComplexType.try_parse(@literal) unless @literal.nil?
-        ComplexType.new
-      end
-    end
-  end
-end
+module Solargraph
+  module Pin
+    class BaseVariable < Base
+      include Solargraph::Source::NodeMethods
+
+      attr_reader :context
+
+      attr_reader :assignment
+
+      def initialize location, namespace, name, comments, assignment, literal, context
+        super(location, namespace, name, comments)
+        @assignment = assignment
+        @literal = literal
+        @context = context
+      end
+
+      def signature
+        @signature ||= resolve_node_signature(@assignment)
+      end
+
+      def completion_item_kind
+        Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
+      end
+
+      # @return [Integer]
+      def symbol_kind
+        Solargraph::LanguageServer::SymbolKinds::VARIABLE
+      end
+
+      def return_complex_type
+        @return_complex_type ||= generate_complex_type
+      end
+
+      def nil_assignment?
+        return_complex_type.nil?
+      end
+
+      def variable?
+        true
+      end
+
+      def probe api_map
+        return ComplexType::UNDEFINED if @assignment.nil?
+        chain = Source::NodeChainer.chain(@assignment, filename)
+        clip = api_map.clip_at(location.filename, location.range.start)
+        locals = clip.locals - [self]
+        chain.infer(api_map, ProxyType.anonymous(context), locals)
+      end
+
+      def == other
+        return false unless super
+        assignment == other.assignment
+      end
+
+      def try_merge! pin
+        return false unless super
+        @assignment = pin.assignment
+        @return_complex_type = pin.return_complex_type
+        true
+      end
+
+      private
+
+      def generate_complex_type
+        tag = docstring.tag(:type)
+        return ComplexType.try_parse(*tag.types) unless tag.nil? || tag.types.nil? || tag.types.empty?
+        return ComplexType.try_parse(@literal) unless @literal.nil?
+        ComplexType.new
+      end
+    end
+  end
+end

data/lib/solargraph/pin/block.rb

@@ -1,32 +1,32 @@
-module Solargraph
-  module Pin
-    class Block < Base
-      # The signature of the method that receives this block.
-      #
-      # @return [Parser::AST::Node]
-      attr_reader :receiver
-
-      def initialize location, namespace, name, comments, receiver, context
-        super(location, namespace, name, comments)
-        @receiver = receiver
-        @context = context
-      end
-
-      def kind
-        Pin::BLOCK
-      end
-
-      # @return [Array<String>]
-      def parameters
-        @parameters ||= []
-      end
-
-      def nearly? other
-        return false unless super
-        # @todo Trying to not to block merges too much
-        # receiver == other.receiver and parameters == other.parameters
-        true
-      end
-    end
-  end
-end
+module Solargraph
+  module Pin
+    class Block < Base
+      # The signature of the method that receives this block.
+      #
+      # @return [Parser::AST::Node]
+      attr_reader :receiver
+
+      def initialize location, namespace, name, comments, receiver, context
+        super(location, namespace, name, comments)
+        @receiver = receiver
+        @context = context
+      end
+
+      def kind
+        Pin::BLOCK
+      end
+
+      # @return [Array<String>]
+      def parameters
+        @parameters ||= []
+      end
+
+      def nearly? other
+        return false unless super
+        # @todo Trying to not to block merges too much
+        # receiver == other.receiver and parameters == other.parameters
+        true
+      end
+    end
+  end
+end

data/lib/solargraph/pin/block_parameter.rb

@@ -1,103 +1,103 @@
-module Solargraph
-  module Pin
-    class BlockParameter < Base
-      include Localized
-
-      # @return [Pin::Block]
-      attr_reader :block
-
-      def initialize location, namespace, name, comments, block
-        super(location, namespace, name, comments)
-        @block = block
-        @presence = block.location.range
-      end
-
-      # @return [Integer]
-      def kind
-        Pin::BLOCK_PARAMETER
-      end
-
-      # @return [Integer]
-      def completion_item_kind
-        Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
-      end
-
-      # @return [Integer]
-      def symbol_kind
-        Solargraph::LanguageServer::SymbolKinds::VARIABLE
-      end
-
-      # The parameter's zero-based location in the block's signature.
-      #
-      # @return [Integer]
-      def index
-        block.parameters.index(self)
-      end
-
-      def nearly? other
-        return false unless super
-        block.nearly?(other.block)
-      end
-
-      def try_merge! other
-        return false unless super
-        @block = other.block
-        @presence = other.block.location.range
-        @return_complex_type = nil
-        true
-      end
-
-      # @return [Array<Solargraph::ComplexType>]
-      def return_complex_type
-        if @return_complex_type.nil?
-          @return_complex_type = ComplexType.new
-          found = nil
-          params = block.docstring.tags(:param)
-          params.each do |p|
-            next unless p.name == name
-            found = p
-            break
-          end
-          if found.nil? and !index.nil?
-            found = params[index] if params[index] && (params[index].name.nil? || params[index].name.empty?)
-          end
-          @return_complex_type = ComplexType.try_parse(*found.types) unless found.nil? or found.types.nil?
-        end
-        super
-        @return_complex_type
-      end
-
-      def context
-        block
-      end
-
-      # @param api_map [ApiMap]
-      def typify api_map
-        # @todo Does anything need to be eliminated because it's more accurately a probe?
-        type = super
-        return type unless type.undefined?
-        chain = Source::NodeChainer.chain(block.receiver, filename)
-        clip = api_map.clip_at(location.filename, location.range.start)
-        locals = clip.locals - [self]
-        meths = chain.define(api_map, block, locals)
-        meths.each do |meth|
-          if (Solargraph::CoreFills::METHODS_WITH_YIELDPARAM_SUBTYPES.include?(meth.path))
-            bmeth = chain.base.define(api_map, context, locals).first
-            return ComplexType::UNDEFINED if bmeth.nil? or bmeth.return_complex_type.undefined? or bmeth.return_complex_type.subtypes.empty?
-            return bmeth.return_complex_type.subtypes.first.qualify(api_map, bmeth.context.namespace)
-          elsif (Solargraph::CoreFills::METHODS_WITH_YIELDPARAM_SELF.include?(meth.path))
-            bmeth = chain.base.define(api_map, context, locals).first
-            return ComplexType::UNDEFINED if bmeth.nil?
-            return bmeth.typify(api_map)
-          else
-            yps = meth.docstring.tags(:yieldparam)
-            unless yps[index].nil? or yps[index].types.nil? or yps[index].types.empty?
-              return ComplexType.try_parse(yps[index].types.first).qualify(api_map, meth.context.namespace)
-            end
-          end
-        end
-        ComplexType::UNDEFINED
-      end
-    end
-  end
-end
+module Solargraph
+  module Pin
+    class BlockParameter < Base
+      include Localized
+
+      # @return [Pin::Block]
+      attr_reader :block
+
+      def initialize location, namespace, name, comments, block
+        super(location, namespace, name, comments)
+        @block = block
+        @presence = block.location.range
+      end
+
+      # @return [Integer]
+      def kind
+        Pin::BLOCK_PARAMETER
+      end
+
+      # @return [Integer]
+      def completion_item_kind
+        Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
+      end
+
+      # @return [Integer]
+      def symbol_kind
+        Solargraph::LanguageServer::SymbolKinds::VARIABLE
+      end
+
+      # The parameter's zero-based location in the block's signature.
+      #
+      # @return [Integer]
+      def index
+        block.parameters.index(self)
+      end
+
+      def nearly? other
+        return false unless super
+        block.nearly?(other.block)
+      end
+
+      def try_merge! other
+        return false unless super
+        @block = other.block
+        @presence = other.block.location.range
+        @return_complex_type = nil
+        true
+      end
+
+      # @return [Array<Solargraph::ComplexType>]
+      def return_complex_type
+        if @return_complex_type.nil?
+          @return_complex_type = ComplexType.new
+          found = nil
+          params = block.docstring.tags(:param)
+          params.each do |p|
+            next unless p.name == name
+            found = p
+            break
+          end
+          if found.nil? and !index.nil?
+            found = params[index] if params[index] && (params[index].name.nil? || params[index].name.empty?)
+          end
+          @return_complex_type = ComplexType.try_parse(*found.types) unless found.nil? or found.types.nil?
+        end
+        super
+        @return_complex_type
+      end
+
+      def context
+        block
+      end
+
+      # @param api_map [ApiMap]
+      def typify api_map
+        # @todo Does anything need to be eliminated because it's more accurately a probe?
+        type = super
+        return type unless type.undefined?
+        chain = Source::NodeChainer.chain(block.receiver, filename)
+        clip = api_map.clip_at(location.filename, location.range.start)
+        locals = clip.locals - [self]
+        meths = chain.define(api_map, block, locals)
+        meths.each do |meth|
+          if (Solargraph::CoreFills::METHODS_WITH_YIELDPARAM_SUBTYPES.include?(meth.path))
+            bmeth = chain.base.define(api_map, context, locals).first
+            return ComplexType::UNDEFINED if bmeth.nil? or bmeth.return_complex_type.undefined? or bmeth.return_complex_type.subtypes.empty?
+            return bmeth.return_complex_type.subtypes.first.qualify(api_map, bmeth.context.namespace)
+          elsif (Solargraph::CoreFills::METHODS_WITH_YIELDPARAM_SELF.include?(meth.path))
+            bmeth = chain.base.define(api_map, context, locals).first
+            return ComplexType::UNDEFINED if bmeth.nil?
+            return bmeth.typify(api_map)
+          else
+            yps = meth.docstring.tags(:yieldparam)
+            unless yps[index].nil? or yps[index].types.nil? or yps[index].types.empty?
+              return ComplexType.try_parse(yps[index].types.first).qualify(api_map, meth.context.namespace)
+            end
+          end
+        end
+        ComplexType::UNDEFINED
+      end
+    end
+  end
+end