solargraph 0.33.2 → 0.34.0

data/lib/solargraph/pin/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     module Common
@@ -11,10 +13,6 @@ module Solargraph
         @name ||= ''
       end
 
-      def kind
-        @kind ||= Pin::KEYWORD
-      end
-
       def return_type
         @return_type ||= ComplexType::UNDEFINED
       end
@@ -49,7 +47,7 @@ module Solargraph
       def find_context
         here = closure
         until here.nil?
-          return here.return_type if here.kind == Pin::NAMESPACE
+          return here.return_type if here.is_a?(Pin::Namespace)
           here = here.closure
         end
         ComplexType::ROOT

data/lib/solargraph/pin/constant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Constant < BaseVariable
@@ -8,10 +10,6 @@ module Solargraph
         @visibility = visibility
       end
 
-      def kind
-        Pin::CONSTANT
-      end
-
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::CONSTANT
       end

data/lib/solargraph/pin/conversions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     # @todo Move this stuff. It should be the responsibility of the language server.
@@ -43,8 +45,8 @@ module Solargraph
       def detail
         # This property is not cached in an instance variable because it can
         # change when pins get proxied.
-        detail = ''
-        detail += "(#{parameters.join(', ')}) " unless kind != Pin::METHOD or parameters.empty?
+        detail = String.new
+        detail += "(#{parameters.join(', ')}) " unless !is_a?(Pin::BaseMethod) or parameters.empty?
         detail += "=#{probed? ? '~' : (proxied? ? '^' : '>')} #{return_type}" unless return_type.undefined?
         detail.strip!
         return nil if detail.empty?

data/lib/solargraph/pin/documenting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rdoc'
 require 'reverse_markdown'
 require 'kramdown'

data/lib/solargraph/pin/duck_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     # DuckMethod pins are used to add completion items for type tags that

data/lib/solargraph/pin/global_variable.rb

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class GlobalVariable < BaseVariable
-      def kind
-        Pin::GLOBAL_VARIABLE
-      end
     end
   end
 end

data/lib/solargraph/pin/instance_variable.rb

@@ -1,10 +1,8 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class InstanceVariable < BaseVariable
-      def kind
-        Pin::INSTANCE_VARIABLE
-      end
-
       def binder
         closure.binder
       end

data/lib/solargraph/pin/keyword.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Keyword < Base
@@ -8,10 +10,6 @@ module Solargraph
       def name
         @name
       end
-
-      def kind
-        Solargraph::Pin::KEYWORD
-      end
     end
   end
 end

data/lib/solargraph/pin/keyword_param.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Solargraph
+  module Pin
+    class KeywordParam < Symbol
+    end
+  end
+end

data/lib/solargraph/pin/local_variable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class LocalVariable < BaseVariable
@@ -9,10 +11,6 @@ module Solargraph
         @presence = presence
       end
 
-      def kind
-        Pin::LOCAL_VARIABLE
-      end
-
       def try_merge! pin
         return false unless super
         @presence = pin.presence

data/lib/solargraph/pin/localized.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     module Localized

data/lib/solargraph/pin/method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'htmlentities'
 
 module Solargraph
@@ -24,10 +26,6 @@ module Solargraph
         @parameter_names ||= parameters.map{|p| p.split(/[ =:]/).first.gsub(/^(\*{1,2}|&)/, '')}
       end
 
-      def kind
-        Solargraph::Pin::METHOD
-      end
-
       def completion_item_kind
         Solargraph::LanguageServer::CompletionItemKinds::METHOD
       end
@@ -73,6 +71,18 @@ module Solargraph
         true
       end
 
+      # @return [Array<Pin::Method>]
+      def overloads
+        @overloads ||= docstring.tags(:overload).map do |tag|
+          Solargraph::Pin::Method.new(
+            name: name,
+            closure: closure,
+            args: tag.parameters.map(&:first),
+            comments: tag.text
+          )
+        end
+      end
+
       private
 
       # @return [Parser::AST::Node, nil]

data/lib/solargraph/pin/method_alias.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     # Use this class to track method aliases for later remapping. Common
@@ -17,10 +19,6 @@ module Solargraph
         @original = original
       end
 
-      def kind
-        Pin::METHOD_ALIAS
-      end
-
       def visibility
         :public
       end

data/lib/solargraph/pin/namespace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Namespace < Closure
@@ -7,23 +9,25 @@ module Solargraph
       # @return [::Symbol] :class or :module
       attr_reader :type
 
-      # def initialize location, namespace, name, comments, type, visibility
-      def initialize type: :class, visibility: :public, **splat
+      # @param type [Symbol] :class or :module
+      # @param visibility [Symbol] :public or :private
+      # @param gates [Array<String>]
+      def initialize type: :class, visibility: :public, gates: [''], **splat
         # super(location, namespace, name, comments)
         super(splat)
         @type = type
         @visibility = visibility
         if name.start_with?('::')
           @name = name[2..-1]
-          @closure = Pin::ROOT_PIN
+          @closure = Solargraph::Pin::ROOT_PIN
         end
-        @gate = @name
-        if @gate.include?('::')
-          parts = @gate.split('::')
-          @name = parts.last
-          adjusted = (@closure ? @closure.path : Pin::ROOT_PIN.path).split('::') + parts[0..-2]
-          # @closure = Pin::Base.new(kind: NAMESPACE, name: adjusted.join('::'))
-          @closure = Pin::Namespace.new(name: adjusted.join('::'))
+        @open_gates = gates
+        if @open_gates.one? && @open_gates.first.empty? && @name.include?('::')
+          # In this case, a chained namespace was opened (e.g., Foo::Bar)
+          # but Foo does not exist.
+          parts = @name.split('::')
+          @name = parts.pop
+          @closure = Pin::Namespace.new(name: parts.join('::'), gates: [parts.join('::')])
           @context = nil
         end
       end
@@ -32,10 +36,6 @@ module Solargraph
         context.namespace
       end
 
-      def kind
-        Pin::NAMESPACE
-      end
-
       def full_context
         @full_context ||= ComplexType.try_parse("#{type.to_s.capitalize}<#{path}>")
       end
@@ -72,6 +72,14 @@ module Solargraph
       def typify api_map
         return_type
       end
+
+      def gates
+        @gates ||= if path.empty?
+          @open_gates
+        else
+          [path] + @open_gates
+        end
+      end
     end
   end
 end

data/lib/solargraph/pin/parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Parameter < LocalVariable
@@ -68,18 +70,14 @@ module Solargraph
           locals = clip.locals - [self]
           meths = chain.define(api_map, closure, locals)
           meths.each do |meth|
-            if (Solargraph::CoreFills::METHODS_WITH_YIELDPARAM_SUBTYPES.include?(meth.path))
+            if meth.docstring.has_tag?(:yieldparam_single_parameter)
               bmeth = chain.base.define(api_map, closure, locals).first
               return ComplexType::UNDEFINED if bmeth.nil? || bmeth.return_type.undefined? || bmeth.return_type.subtypes.empty?
               return bmeth.return_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, closure, 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)
+                return ComplexType.try_parse(yps[index].types.first).self_to(chain.base.infer(api_map, closure, locals).namespace).qualify(api_map, meth.context.namespace)
               end
             end
           end

data/lib/solargraph/pin/proxy_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class ProxyType < Base

data/lib/solargraph/pin/reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference < Base

data/lib/solargraph/pin/reference/extend.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference
       class Extend < Reference
-        def kind
-          Pin::EXTEND_REFERENCE
-        end
       end
     end
   end

data/lib/solargraph/pin/reference/include.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference
       class Include < Reference
-        def kind
-          Pin::INCLUDE_REFERENCE
-        end
       end
     end
   end

data/lib/solargraph/pin/reference/override.rb

@@ -1,16 +1,25 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference
       class Override < Reference
         attr_reader :tags
 
-        def initialize location, name, tags
+        attr_reader :delete
+
+        def initialize location, name, tags, delete = []
           super(location: location, name: name)
           @tags = tags
+          @delete = delete
+        end
+
+        def self.method_return name, *tags, delete: []
+          new(nil, name, [YARD::Tags::Tag.new('return', nil, tags)], delete)
         end
 
-        def kind
-          Pin::OVERRIDE_REFERENCE
+        def self.from_comment name, comment
+          new(nil, name, Solargraph::Source.parse_docstring(comment).to_docstring.tags)
         end
       end
     end

data/lib/solargraph/pin/reference/require.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference
@@ -6,10 +8,6 @@ module Solargraph
           # super(location, '', name)
           super(location: location, name: name)
         end
-
-        def kind
-          Pin::REQUIRE_REFERENCE
-        end
       end
     end
   end

data/lib/solargraph/pin/reference/superclass.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Reference
       class Superclass < Reference
-        def kind
-          Pin::SUPERCLASS_REFERENCE
-        end
       end
     end
   end

data/lib/solargraph/pin/singleton.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Singleton < Closure

data/lib/solargraph/pin/symbol.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     class Symbol < Base
@@ -13,10 +15,6 @@ module Solargraph
         ''
       end
 
-      def kind
-        Pin::SYMBOL
-      end
-
       def path
         ''
       end

data/lib/solargraph/pin/yard_pin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     module YardPin

data/lib/solargraph/pin/yard_pin/constant.rb

@@ -1,19 +1,23 @@
+# frozen_string_literal: true
+
 module Solargraph
   module Pin
     module YardPin
       class Constant < Pin::Constant
         include YardMixin
 
-        def initialize code_object, location, closure = nil
+        def initialize code_object, closure = nil, spec = nil
           @code_object = code_object
+          @spec = spec
           closure ||= Solargraph::Pin::Namespace.new(
-            name: code_object.namespace.to_s
+            name: code_object.namespace.to_s,
+            gates: [code_object.namespace.to_s]
           )
           super(
             location: location,
             closure: closure,
             name: code_object.name.to_s,
-            comments: comments_from(code_object),
+            comments: nil,
             visibility: code_object.visibility
           )
         end