solargraph 0.26.1 → 0.27.0

data/lib/solargraph/live_map.rb

@@ -21,7 +21,7 @@ module Solargraph
 
     # @return [Array<Solargraph::Pin::Base>]
     def get_methods(namespace, root = '', scope = 'instance', with_private = false)
-      fqns = api_map.find_fully_qualified_namespace(namespace, root)
+      fqns = api_map.qualify(namespace, root)
       params = {
         namespace: namespace, root: root, scope: scope, with_private: with_private
       }

data/lib/solargraph/location.rb

@@ -0,0 +1,28 @@
+module Solargraph
+  class Location
+    # @return [String]
+    attr_reader :filename
+
+    # @return [Solargraph::Range]
+    attr_reader :range
+
+    # @param filename [String]
+    # @param range [Solargraph::Range]
+    def initialize filename, range
+      @filename = filename
+      @range = range
+    end
+
+    def to_hash
+      {
+        filename: filename,
+        range: range.to_hash
+      }
+    end
+
+    def == other
+      return false unless other.is_a?(Location)
+      filename == other.filename and range == other.range
+    end
+  end
+end

data/lib/solargraph/pin.rb

@@ -36,5 +36,7 @@ module Solargraph
     SYMBOL = 10
     BLOCK = 11
     BLOCK_PARAMETER = 12
+
+    ROOT_PIN = Pin::Namespace.new(nil, '', '', '', :class, :public, nil)
   end
 end

data/lib/solargraph/pin/attribute.rb

@@ -7,10 +7,14 @@ module Solargraph
       # @return [Symbol] :class or :instance
       attr_reader :scope
 
-      def initialize location, namespace, name, comments, access, scope
+      # @return [Symbol] :public, :protected, or :private
+      attr_reader :visibility
+
+      def initialize location, namespace, name, comments, access, scope, visibility
         super(location, namespace, name, comments)
         @access = access
         @scope = scope
+        @visibility = visibility
       end
 
       def kind
@@ -30,17 +34,7 @@ module Solargraph
       end
 
       def return_complex_type
-        if @return_complex_type.nil?
-          @return_complex_type = ComplexType.new
-          tag = docstring.tag(:return)
-          @return_complex_type = ComplexType.parse(*tag.types) unless tag.nil?
-        end
-        @return_complex_type
-      end
-
-      def visibility
-        # @todo Check attribute visibility
-        :public
+        @return_complex_type ||= generate_complex_type
       end
 
       def parameters
@@ -52,6 +46,26 @@ module Solargraph
       def parameter_names
         []
       end
+
+      private
+
+      # @todo DRY this method. It also exists in Pin::Method.
+      #
+      # @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?
+        begin
+          ComplexType.parse *tag.types
+        rescue Solargraph::ComplexTypeError => e
+          STDERR.puts e.message
+          ComplexType::UNDEFINED
+        end
+      end
     end
   end
 end

data/lib/solargraph/pin/base.rb

@@ -6,7 +6,7 @@ module Solargraph
       include Conversions
       include Documenting
 
-      # @return [Solargraph::Source::Location]
+      # @return [Solargraph::Location]
       attr_reader :location
 
       # The namespace in which this pin is defined.
@@ -24,7 +24,7 @@ module Solargraph
       # @return [String]
       attr_reader :path
 
-      # @param location [Solargraph::Source::Location]
+      # @param location [Solargraph::Location]
       # @param namespace [String]
       # @param name [String]
       # @param comments [String]
@@ -75,9 +75,9 @@ module Solargraph
         false
       end
 
-      # @return [String]
-      def named_context
-        namespace
+      # @return [ComplexType]
+      def context
+        @context ||= ComplexType.parse(namespace || '')
       end
 
       # Pin equality is determined using the #nearly? method and also
@@ -85,7 +85,7 @@ module Solargraph
       #
       def == other
         return false unless nearly? other
-        location == other.location
+        comments == other.comments and location == other.location
       end
 
       # True if the specified pin is a near match to this one. A near match
@@ -106,43 +106,18 @@ module Solargraph
           )
       end
 
-      # The first return type associated with the pin.
-      # Use return_complex_types for an array of all return types.
+      # An alias for return_complex_type.
       #
-      # @return [String]
+      # @return [ComplexType]
       def return_type
-        return nil if return_complex_type.void?
-        return_complex_type.first.tag
-      end
-
-      # The namespace of the first return type.
-      # Use return_complex_types for an array of all return types.
-      #
-      # @deprecated Not in active internal use
-      #
-      # @return [String]
-      def return_namespace
-        return_type
-        return nil if return_complex_type.void?
-        @return_namespace ||= return_complex_type.first.namespace
-      end
-
-      # The scope of the first return type.
-      # Use return_complex_types for an array of all return types.
-      #
-      # @deprecated Not in active internal use
-      #
-      # @return [String]
-      def return_scope
-        return nil if return_complex_type.void?
-        @return_scope ||= return_complex_type.first.scope
+        return_complex_type
       end
 
       # All of the pin's return types as an array of ComplexTypes.
       #
       # @return [ComplexType]
       def return_complex_type
-        @return_complex_type ||= ComplexType.new
+        @return_complex_type ||= ComplexType::UNDEFINED
       end
 
       # @return [YARD::Docstring]
@@ -157,6 +132,11 @@ module Solargraph
         @directives
       end
 
+      # @return [Array<YARD::Tags::MacroDirective>]
+      def macros
+        @macros ||= []
+      end
+
       # Perform a quick check to see if this pin possibly includes YARD
       # directives. This method does not require parsing the comments.
       #

data/lib/solargraph/pin/base_variable.rb

@@ -5,6 +5,8 @@ module Solargraph
 
       attr_reader :context
 
+      attr_reader :assignment
+
       def initialize location, namespace, name, comments, assignment, literal, context
         super(location, namespace, name, comments)
         @assignment = assignment
@@ -16,10 +18,6 @@ module Solargraph
         @signature ||= resolve_node_signature(@assignment)
       end
 
-      def scope
-        @scope ||= (context.kind == Pin::METHOD and context.scope == :instance ? :instance : :class)
-      end
-
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::VARIABLE
       end
@@ -34,7 +32,7 @@ module Solargraph
       end
 
       def nil_assignment?
-        return_type == 'NilClass'
+        return_complex_type.nil?
       end
 
       def variable?
@@ -45,12 +43,10 @@ module Solargraph
       def infer api_map
         result = super
         return result if result.defined? or @assignment.nil?
-        # chain = Source::Chain.new(filename, @assignment)
-        # @todo Use NodeChainer
-        chain = Source::NodeChainer.chain(location.filename, @assignment)
-        fragment = api_map.fragment_at(location)
-        locals = fragment.locals - [self]
-        chain.infer_type_with(api_map, context, locals)
+        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
@@ -65,10 +61,6 @@ module Solargraph
         true
       end
 
-      protected
-
-      attr_reader :assignment
-
       private
 
       def generate_complex_type

data/lib/solargraph/pin/block.rb

@@ -9,29 +9,25 @@ module Solargraph
       # @return [Array<String>]
       attr_reader :parameters
 
-      attr_reader :scope
-
-      def initialize location, namespace, name, comments, receiver, scope
+      def initialize location, namespace, name, comments, receiver, context
         super(location, namespace, name, comments)
         @receiver = receiver
-        @scope = scope
+        @context = context
       end
 
       def kind
         Pin::BLOCK
       end
 
-      def return_complex_type
-        @return_complex_type ||= Solargraph::ComplexType.parse(namespace)
-      end
-
       def parameters
         @parameters ||= []
       end
 
       def nearly? other
         return false unless super
-        receiver == other.receiver and parameters == other.parameters
+        # @todo Trying to not to block merges too much
+        # receiver == other.receiver and parameters == other.parameters
+        true
       end
     end
   end

data/lib/solargraph/pin/block_parameter.rb

@@ -42,8 +42,9 @@ module Solargraph
       def try_merge! other
         return false unless super
         @block = other.block
-        @presence = block.location.range
+        @presence = other.block.location.range
         @return_complex_type = nil
+        true
       end
 
       # @return [Array<Solargraph::ComplexType>]
@@ -65,17 +66,18 @@ module Solargraph
         block
       end
 
+      # @param api_map [ApiMap]
       def infer api_map
         return return_complex_type unless return_complex_type.undefined?
-        chain = Source::NodeChainer.chain(location.filename, block.receiver)
-        fragment = api_map.fragment_at(location)
-        locals = fragment.locals - [self]
-        meths = chain.define_with(api_map, block, fragment.locals)
+        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.define_base_with(api_map, context, locals).first
+            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)
+            return bmeth.return_complex_type.subtypes.first.qualify(api_map, bmeth.context.namespace)
           else
             yps = meth.docstring.tags(:yieldparam)
             unless yps[index].nil? or yps[index].types.nil? or yps[index].types.empty?

data/lib/solargraph/pin/conversions.rb

@@ -10,8 +10,8 @@ module Solargraph
           detail: detail,
           data: {
             path: path,
-            return_type: return_type,
-            location: location,
+            return_type: return_type.tag,
+            location: (location ? location.to_hash : nil),
             deprecated: deprecated?
           }
         }
@@ -69,9 +69,9 @@ module Solargraph
       private
 
       def generate_link
-        return nil if return_complex_type.undefined?
-        this_path = path || return_type
-        return nil if this_path.nil?
+        this_path = path || return_type.tag
+        return this_path if comments.empty?
+        return nil if this_path.nil? or this_path == 'undefined'
         "[#{this_path.gsub('_', '\\\\_')}](solargraph:/document?query=#{URI.encode(this_path)})"
       end
     end

data/lib/solargraph/pin/duck_method.rb

@@ -4,7 +4,7 @@ module Solargraph
     # use duck typing, e.g., `@param file [#read]`.
     #
     class DuckMethod < Pin::Method
-      # @param location [Solargraph::Source::Location]
+      # @param location [Solargraph::Location]
       # @param name [String]
       def initialize location, name
         super(location, 'Object', name, nil, :instance, :public, [])

data/lib/solargraph/pin/instance_variable.rb

@@ -4,10 +4,6 @@ module Solargraph
       def kind
         Pin::INSTANCE_VARIABLE
       end
-
-      def scope
-        @scope ||= (context.kind == Pin::NAMESPACE ? :class : context.scope)
-      end
     end
   end
 end

data/lib/solargraph/pin/keyword.rb

@@ -9,6 +9,10 @@ module Solargraph
         @name
       end
 
+      def kind
+        Solargraph::Pin::KEYWORD
+      end
+
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::KEYWORD
       end

data/lib/solargraph/pin/localized.rb

@@ -3,15 +3,17 @@ module Solargraph
     module Localized
       attr_reader :block
 
-      # @return [Source::Range]
+      # @return [Range]
       attr_reader :presence
 
       # @param other [Pin::Base] The caller's block
-      # @param position [Source::Position] The caller's position
+      # @param position [Position] The caller's position
       # @return [Boolean]
       def visible_from?(other, position)
         other.filename == filename and
-          (other == block or other.named_context == named_context) and
+          ( other == block or 
+            (block.location.range.contain?(other.location.range.start) and block.location.range.contain?(other.location.range.ending))
+          ) and
           presence.contain?(position)
       end
     end

data/lib/solargraph/pin/method.rb

@@ -30,6 +30,17 @@ module Solargraph
         @path ||= namespace + (scope == :instance ? '#' : '.') + name
       end
 
+      def context
+        @context ||= begin
+          if scope == :class
+            # @todo Determine whether the namespace is a class or a module
+            ComplexType.parse("Class<#{namespace}>")
+          else
+            ComplexType.parse(namespace)
+          end
+        end
+      end
+
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::METHOD
       end

data/lib/solargraph/pin/namespace.rb

@@ -30,12 +30,12 @@ module Solargraph
         Pin::NAMESPACE
       end
 
-      def named_context
-        path
+      def context
+        @context ||= ComplexType.parse("#{type.to_s.capitalize}<#{path}>")
       end
 
       def scope
-        :class
+        context.scope
       end
 
       def completion_item_kind
@@ -55,6 +55,10 @@ module Solargraph
         @return_complex_type ||= ComplexType.parse( (type == :class ? 'Class' : 'Module') + "<#{path}>" )
       end
 
+      def domains
+        @domains ||= []
+      end
+
       def infer api_map
         # Assuming that namespace pins are always fully qualified
         return_complex_type