solargraph 0.39.12 → 0.39.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94e2150b6575ab34c7a13a51616cdbce7e21e13bff1b6cc2e6f4307960501acb
-  data.tar.gz: 474e22c2f716481a1410a8ba5199ce94b9d912573a29e077c29cea075fb8fd3d
+  metadata.gz: 1848998bad3115b797b00dc04fb88b25da2f4db11faf957ca939d5701d8adcc4
+  data.tar.gz: 07e255512496a029a4e7b58b04e080404a73ebd53a588a30a0028ab0a0c0b98e
 SHA512:
-  metadata.gz: ded8a57414921d2fc45616d9f8d10c8c6581d1769657968bd3b40e3b59d199f4090e9e086319cbea26dd9f4cab0d7231ebfd2b58b7f8f15524de745fc351ea88
-  data.tar.gz: f6fabb492847eb4091b0d642d9b41a28abb1b39e983f338828b17baf3a79aad1006244ef2dafbbd51757e11e4ac91eb721431151afe0e61ee11dc792e3d045f5
+  metadata.gz: 1b98d066a55f938ccc7634ddd89a9fcb93c3748ebc01ad80bcf0b6f9ff8c125784cf5e799300ed1fadb8b3909efa4063ce8584f375d58a9e1934665554bd3a60
+  data.tar.gz: 42f01bf895f7649f24b9d0573af731f629b8a0428a4c91cc4641877c539b54ce3c9077a337148bd2fc0b8df22ace77447bab5bebacb33577418be9f4b48378b5

data/Rakefile

@@ -11,4 +11,15 @@ end
 desc "Open a Pry session preloaded with this library"
 task :console do
   sh "pry -I lib -r solargraph.rb"
-end
+end
+
+desc "Run the type checker"
+task :typecheck do
+  sh "bundle exec solargraph typecheck --level typed"
+end
+
+desc "Run all tests"
+task :test do
+  Rake::Task["typecheck"].invoke
+  Rake::Task["spec"].invoke
+end

data/SPONSORS.md

@@ -4,6 +4,10 @@ Solargraph is developed and maintained by [Castwide Technologies](https://castwi
 
 The following people and organizations provide funding or other resources. [Become a sponsor](https://patreon.com/castwide)
 
+## Linked Sponsors
+
+- **[Calyptix Security](https://www.calyptix.com/)**
+
 ## Named Sponsors
 
 - Emily Strickland

data/lib/solargraph/api_map.rb

@@ -386,9 +386,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def get_path_suggestions path
       return [] if path.nil?
-      result = []
-      result.concat store.get_path_pins(path)
-      resolve_method_aliases(result)
+      resolve_method_aliases store.get_path_pins(path)
     end
 
     # Get an array of pins that match the specified path.
@@ -423,7 +421,7 @@ module Solargraph
     #   api_map.document('String#split')
     #
     # @param path [String] The path to find
-    # @return [Array<YARD::CodeObject::Base>]
+    # @return [Array<YARD::CodeObjects::Base>]
     def document path
       rake_yard(store)
       docs = []
@@ -447,7 +445,7 @@ module Solargraph
     # @return [Array<Solargraph::Pin::Base>]
     def locate_pins location
       return [] if location.nil? || !source_map_hash.has_key?(location.filename)
-      source_map_hash[location.filename].locate_pins(location)
+      resolve_method_aliases source_map_hash[location.filename].locate_pins(location)
     end
 
     # @raise [FileNotFoundError] if the cursor's file is not in the ApiMap
@@ -464,7 +462,7 @@ module Solargraph
     # @return [Array<Pin::Symbol>]
     def document_symbols filename
       return [] unless source_map_hash.has_key?(filename) # @todo Raise error?
-      source_map_hash[filename].document_symbols
+      resolve_method_aliases source_map_hash[filename].document_symbols
     end
 
     # @return [Array<SourceMap>]
@@ -659,6 +657,7 @@ module Solargraph
       return nil if name.nil?
       return nil if skip.include?(root)
       skip.add root
+      possibles = []
       if name == ''
         if root == ''
           return ''
@@ -674,16 +673,19 @@ module Solargraph
           incs = store.get_includes(roots.join('::'))
           incs.each do |inc|
             foundinc = inner_qualify(name, inc, skip)
-            return foundinc unless foundinc.nil?
+            possibles.push foundinc unless foundinc.nil?
           end
           roots.pop
         end
-        incs = store.get_includes('')
-        incs.each do |inc|
-          foundinc = inner_qualify(name, inc, skip)
-          return foundinc unless foundinc.nil?
+        if possibles.empty?
+          incs = store.get_includes('')
+          incs.each do |inc|
+            foundinc = inner_qualify(name, inc, skip)
+            possibles.push foundinc unless foundinc.nil?
+          end
         end
         return name if store.namespace_exists?(name)
+        return possibles.last
       end
     end
 
@@ -723,7 +725,7 @@ module Solargraph
       result = []
       pins.each do |pin|
         resolved = resolve_method_alias(pin)
-        next unless visibility.include?(resolved.visibility)
+        next if resolved.respond_to?(:visibility) && !visibility.include?(resolved.visibility)
         result.push resolved
       end
       result
@@ -737,15 +739,17 @@ module Solargraph
       origin = get_method_stack(pin.full_context.namespace, pin.original, scope: pin.scope).first
       @method_alias_stack.pop
       return pin if origin.nil?
-      Pin::Method.new(
+      args = {
         location: pin.location,
         closure: pin.closure,
         name: pin.name,
         comments: origin.comments,
         scope: origin.scope,
-        visibility: origin.visibility,
-        parameters: origin.parameters
-      )
+        visibility: origin.visibility
+      }
+      args[:parameters] = origin.parameters unless origin.is_a?(Pin::Attribute)
+      klass = origin.is_a?(Pin::Attribute) ? Pin::Attribute : Pin::Method
+      klass.new **args
     end
   end
 end

data/lib/solargraph/api_map/store.rb

@@ -218,7 +218,7 @@ module Solargraph
         @pin_select_cache = {}
         @namespace_map = set.classify(&:namespace).transform_values(&:to_a)
         @path_pin_hash = set.classify(&:path).transform_values(&:to_a)
-        @namespaces = @path_pin_hash.keys.compact
+        @namespaces = @path_pin_hash.keys.compact.to_set
         pins_by_class(Pin::Reference::Include).each do |pin|
           include_references[pin.namespace] ||= []
           include_references[pin.namespace].push pin.name

data/lib/solargraph/complex_type.rb

@@ -12,7 +12,7 @@ module Solargraph
 
     # @param types [Array<UniqueType>]
     def initialize types = [UniqueType::UNDEFINED]
-      @items = types
+      @items = types.uniq(&:to_s)
     end
 
     # @param api_map [ApiMap]
@@ -113,7 +113,7 @@ module Solargraph
       #
       # @param *strings [Array<String>] The type definitions to parse
       # @param partial [Boolean] True if the string is part of a another type
-      # @return [ComplexType]
+      # @return [ComplexType, Array, nil]
       def parse *strings, partial: false
         @cache ||= {}
         unless partial

data/lib/solargraph/convention.rb

@@ -15,7 +15,7 @@ module Solargraph
     @@conventions = Set.new
 
     # @param convention [Class<Convention::Base>]
-    # @return [Convention::Base]
+    # @return [void]
     def self.register convention
       @@conventions.add convention.new
     end

data/lib/solargraph/core_fills.rb

@@ -53,6 +53,7 @@ module Solargraph
   @return_single_parameter
 @return_single_parameter
       )),
+      Override.method_return('Array#concat', 'Array'),
       Override.from_comment('Array#first', %(
 @overload first(num)
   @param num [Integer]
@@ -65,7 +66,9 @@ module Solargraph
   @return [self]
 @return_single_parameter
       )),
+      Override.method_return('Array#map', 'Array'),
       Override.method_return('Array#uniq', 'self'),
+      Override.method_return('Array#zip', 'Array, nil'),
 
       Override.from_comment('BasicObject#==', %(
 @param other [BasicObject]
@@ -101,6 +104,8 @@ module Solargraph
 @param_tuple
       )),
 
+      Override.method_return('Hash#merge', 'Hash'),
+
       Override.from_comment('Integer#+', %(
 @param y [Numeric]
 @return [Numeric]
@@ -108,10 +113,6 @@ module Solargraph
 
       Override.method_return('Kernel#puts', 'nil'),
 
-      # Override.method_return('Module#attr_reader', 'void'),
-      # Override.method_return('Module#attr_writer', 'void'),
-      # Override.method_return('Module#attr_accessor', 'void'),
-
       Override.from_comment('Numeric#+', %(
 @param y [Numeric]
 @return [Numeric]
@@ -147,6 +148,10 @@ module Solargraph
       Override.method_return('String#lines', 'Array<String>'),
       Override.from_comment('String#each_line', %(
 @yieldparam [String]
+      )),
+      Override.from_comment('String.new', %(
+@overload new(*)
+  @return [self]
       ))
     ].concat(
       methods_with_yieldparam_subtypes.map do |path|

data/lib/solargraph/documentor.rb

@@ -55,6 +55,8 @@ module Solargraph
       false
     end
 
+    # @param directory [String]
+    # @return [Hash]
     def self.specs_from_bundle directory
       Solargraph.with_clean_env do
         Dir.chdir directory do

data/lib/solargraph/library.rb

@@ -174,10 +174,10 @@ module Solargraph
       if cursor.comment?
         source = read(filename)
         offset = Solargraph::Position.to_offset(source.code, Solargraph::Position.new(line, column))
-        lft = source.code[0..offset-1].match(/\[([a-z0-9_:]*)\z/i)
-        rgt = source.code[offset..-1].match(/^([a-z0-9_]*)(:[a-z0-9_:]*)?\]/i)
+        lft = source.code[0..offset-1].match(/\[[a-z0-9_:<, ]*?([a-z0-9_:]*)\z/i)
+        rgt = source.code[offset..-1].match(/^([a-z0-9_]*)(:[a-z0-9_:]*)?[\]>, ]/i)
         if lft && rgt
-          tag = lft[1] + rgt[1]
+          tag = (lft[1] + rgt[1]).sub(/:+$/, '')
           clip = api_map.clip(cursor)
           clip.translate tag
         else
@@ -259,7 +259,7 @@ module Solargraph
     end
 
     # @param query [String]
-    # @return [Array<YARD::CodeObject::Base>]
+    # @return [Array<YARD::CodeObjects::Base>]
     def document query
       catalog
       api_map.document query

data/lib/solargraph/parser/legacy/node_chainer.rb

@@ -14,7 +14,7 @@ module Solargraph
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
-          @in_block = in_block
+          @in_block = in_block ? 1 : 0
         end
 
         # @return [Source::Chain]
@@ -51,9 +51,9 @@ module Solargraph
           return generate_links(n.children[0]) if n.type == :splat
           result = []
           if n.type == :block
-            @in_block = true
+            @in_block += 1
             result.concat generate_links(n.children[0])
-            @in_block = false
+            @in_block -= 1
           elsif n.type == :send
             if n.children[0].is_a?(::Parser::AST::Node)
               result.concat generate_links(n.children[0])
@@ -61,23 +61,23 @@ module Solargraph
               n.children[2..-1].each do |c|
                 args.push NodeChainer.chain(c)
               end
-              result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n))
+              result.push Chain::Call.new(n.children[1].to_s, args, @in_block > 0 || block_passed?(n))
             elsif n.children[0].nil?
               args = []
               n.children[2..-1].each do |c|
                 args.push NodeChainer.chain(c)
               end
-              result.push Chain::Call.new(n.children[1].to_s, args, @in_block || block_passed?(n))
+              result.push Chain::Call.new(n.children[1].to_s, args, @in_block > 0 || block_passed?(n))
             else
               raise "No idea what to do with #{n}"
             end
           elsif n.type == :self
             result.push Chain::Head.new('self')
           elsif n.type == :zsuper
-            result.push Chain::ZSuper.new('super', @in_block || block_passed?(n))
+            result.push Chain::ZSuper.new('super', @in_block > 0 || block_passed?(n))
           elsif n.type == :super
             args = n.children.map { |c| NodeChainer.chain(c) }
-            result.push Chain::Call.new('super', args, @in_block || block_passed?(n))
+            result.push Chain::Call.new('super', args, @in_block > 0 || block_passed?(n))
           elsif n.type == :const
             const = unpack_name(n)
             result.push Chain::Constant.new(const)

data/lib/solargraph/parser/legacy/node_processors/send_node.rb

@@ -90,7 +90,8 @@ module Solargraph
             if node.children[2].is_a?(AST::Node) && node.children[2].type == :const
               cp = region.closure
               node.children[2..-1].each do |i|
-                pins.push Pin::Reference::Include.new(
+                type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+                pins.push type.new(
                   location: get_node_location(i),
                   closure: cp,
                   name: unpack_name(i)

data/lib/solargraph/parser/rubyvm/node_chainer.rb

@@ -15,7 +15,7 @@ module Solargraph
         def initialize node, filename = nil, in_block = false
           @node = node
           @filename = filename
-          @in_block = in_block
+          @in_block = in_block ? 1 : 0
         end
 
         # @return [Source::Chain]
@@ -52,27 +52,27 @@ module Solargraph
           return generate_links(n.children[0]) if n.type == :SPLAT
           result = []
           if n.type == :ITER
-            @in_block = true
+            @in_block += 1
             result.concat generate_links(n.children[0])
-            @in_block = false
+            @in_block -= 1
           elsif n.type == :CALL || n.type == :OPCALL
             n.children[0..-3].each do |c|
               result.concat generate_links(c)
             end
-            result.push Chain::Call.new(n.children[-2].to_s, node_to_argchains(n.children.last), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[-2].to_s, node_to_argchains(n.children.last), @in_block > 0 || block_passed?(n))
           elsif n.type == :ATTRASGN
             result.concat generate_links(n.children[0])
-            result.push Chain::Call.new(n.children[1].to_s, node_to_argchains(n.children[2]), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[1].to_s, node_to_argchains(n.children[2]), @in_block > 0 || block_passed?(n))
           elsif n.type == :VCALL
-            result.push Chain::Call.new(n.children[0].to_s, [], @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[0].to_s, [], @in_block > 0 || block_passed?(n))
           elsif n.type == :FCALL
-            result.push Chain::Call.new(n.children[0].to_s, node_to_argchains(n.children[1]), @in_block || block_passed?(n))
+            result.push Chain::Call.new(n.children[0].to_s, node_to_argchains(n.children[1]), @in_block > 0 || block_passed?(n))
           elsif n.type == :SELF
             result.push Chain::Head.new('self')
           elsif n.type == :ZSUPER
-            result.push Chain::ZSuper.new('super', @in_block || block_passed?(n))
+            result.push Chain::ZSuper.new('super', @in_block > 0 || block_passed?(n))
           elsif n.type == :SUPER
-            result.push Chain::Call.new('super', node_to_argchains(n.children.last), @in_block || block_passed?(n))
+            result.push Chain::Call.new('super', node_to_argchains(n.children.last), @in_block > 0 || block_passed?(n))
           elsif [:COLON2, :COLON3, :CONST].include?(n.type)
             const = unpack_name(n)
             result.push Chain::Constant.new(const)

data/lib/solargraph/parser/rubyvm/node_methods.rb

@@ -197,7 +197,7 @@ module Solargraph
                 result.push node
                 result.concat get_return_nodes_only(node.children[1])
               elsif node.type == :CASE
-                node.children.each do |cc|
+                node.children[1..-1].each do |cc|
                   result.concat reduce_to_value_nodes(cc.children[1..-1])
                 end
               else

data/lib/solargraph/parser/rubyvm/node_processors.rb

@@ -54,6 +54,7 @@ module Solargraph
       register :KW_ARG,     Rubyvm::NodeProcessors::KwArgNode
       register :ITER,       Rubyvm::NodeProcessors::BlockNode
       register :LAMBDA,     Rubyvm::NodeProcessors::BlockNode
+      register :FOR,        Rubyvm::NodeProcessors::BlockNode
       register :OP_ASGN_OR, Rubyvm::NodeProcessors::OrasgnNode
       register :LIT,        Rubyvm::NodeProcessors::LitNode
     end

data/lib/solargraph/parser/rubyvm/node_processors/args_node.rb

@@ -7,16 +7,30 @@ module Solargraph
         class ArgsNode < Parser::NodeProcessor::Base
           def process
             if region.closure.is_a?(Pin::BaseMethod) || region.closure.is_a?(Pin::Block)
-              node.children[0].times do |i|
-                locals.push Solargraph::Pin::Parameter.new(
-                  location: region.closure.location,
-                  closure: region.closure,
-                  comments: comments_for(node),
-                  name: region.lvars[i].to_s,
-                  presence: region.closure.location.range,
-                  decl: :arg
-                )
-                region.closure.parameters.push locals.last
+              if region.lvars[0].nil?
+                node.children[0].times do |i|
+                  locals.push Solargraph::Pin::Parameter.new(
+                    location: region.closure.location,
+                    closure: region.closure,
+                    comments: comments_for(node),
+                    name: extract_name(node.children[i + 1]),
+                    presence: region.closure.location.range,
+                    decl: :arg
+                  )
+                  region.closure.parameters.push locals.last
+                end
+              else
+                node.children[0].times do |i|
+                  locals.push Solargraph::Pin::Parameter.new(
+                    location: region.closure.location,
+                    closure: region.closure,
+                    comments: comments_for(node),
+                    name: region.lvars[i].to_s,
+                    presence: region.closure.location.range,
+                    decl: :arg
+                  )
+                  region.closure.parameters.push locals.last
+                end
               end
               # @todo Optional args, keyword args, etc.
               if node.children[6]
@@ -55,6 +69,16 @@ module Solargraph
             end
             process_children
           end
+
+          private
+
+          def extract_name var
+            if Parser.is_ast_node?(var)
+              var.children[0].to_s
+            else
+              var.to_s
+            end
+          end
         end
       end
     end

data/lib/solargraph/parser/rubyvm/node_processors/send_node.rb

@@ -91,7 +91,8 @@ module Solargraph
             return unless Parser.is_ast_node?(node.children.last)
             node.children.last.children[0..-2].each do |i|
               next unless [:COLON2, :COLON3, :CONST].include?(i.type)
-              pins.push Pin::Reference::Include.new(
+              type = region.scope == :class ? Pin::Reference::Extend : Pin::Reference::Include
+              pins.push type.new(
                 location: get_node_location(i),
                 closure: region.closure,
                 name: unpack_name(i)

data/lib/solargraph/pin/base_method.rb

@@ -84,6 +84,14 @@ module Solargraph
         @explicit
       end
 
+      def completion_item_kind
+        Solargraph::LanguageServer::CompletionItemKinds::METHOD
+      end
+
+      def symbol_kind
+        Solargraph::LanguageServer::SymbolKinds::METHOD
+      end
+
       private
 
       # @return [ComplexType]

data/lib/solargraph/pin/conversions.rb

@@ -23,16 +23,15 @@ module Solargraph
 
       # @return [Hash]
       def resolve_completion_item
-        if @resolve_completion_item.nil?
+        @resolve_completion_item ||= begin
           extra = {}
           alldoc = ''
           # alldoc += link_documentation unless link_documentation.nil?
           # alldoc += "\n\n" unless alldoc.empty?
           alldoc += documentation unless documentation.nil?
           extra[:documentation] = alldoc unless alldoc.empty?
-          @resolve_completion_item = completion_item.merge(extra)
+          completion_item.merge(extra)
         end
-        @resolve_completion_item
       end
 
       # @return [Hash]

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

@@ -6,6 +6,12 @@ module Solargraph
       class Method < Pin::Method
         include YardMixin
 
+        # @param code_object [YARD::CodeObjects::Base]
+        # @param name [String, nil]
+        # @param scope [Symbol, nil]
+        # @param visibility [Symbol, nil]
+        # @param closure [Solargraph::Pin::Closure, nil]
+        # @param spec [Gem::Specification]
         def initialize code_object, name = nil, scope = nil, visibility = nil, closure = nil, spec = nil
           closure ||= Solargraph::Pin::Namespace.new(
             name: code_object.namespace.to_s,
@@ -25,9 +31,14 @@ module Solargraph
 
         private
 
+        # @param code_object [YARD::CodeObjects::Base]
+        # @return [Array<Solargraph::Pin::Parameter>]
         def get_parameters code_object
           return [] unless code_object.is_a?(YARD::CodeObjects::MethodObject)
-          code_object.parameters.map do |a|
+          # HACK: Skip `nil` and `self` parameters that are sometimes emitted
+          # for methods defined in C
+          # See https://github.com/castwide/solargraph/issues/345
+          code_object.parameters.select { |a| a[0] && a[0] != 'self' }.map do |a|
             Solargraph::Pin::Parameter.new(
               location: location,
               closure: self,
@@ -40,10 +51,14 @@ module Solargraph
           end
         end
 
+        # @param a [Array]
+        # @return [String]
         def arg_name a
-          a[0].match(/[A-Za-z0-9_]*/)[0]
+          a[0].gsub(/[^a-z0-9_]/i, '')
         end
 
+        # @param a [Array]
+        # @return [::Symbol]
         def arg_type a
           if a[0].start_with?('**')
             :kwrestarg
@@ -51,10 +66,10 @@ module Solargraph
             :restarg
           elsif a[0].start_with?('&')
             :blockarg
+          elsif a[0].end_with?(':')
+            a[1] ? :kwoptarg : :kwarg
           elsif a[1]
             :optarg
-          elsif a[0].end_with?(':')
-            a[1] ? :kwarg : :kwoptarg
           else
             :arg
           end

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

@@ -4,16 +4,10 @@ module Solargraph
   module Pin
     module YardPin
       module YardMixin
-        attr_reader :code_object
-
-        attr_reader :spec
-
-        attr_reader :location
-
-        @@gate_cache ||= {}
-
         private
 
+        # @param code_object [YARD::CodeObjects::Base]
+        # @param spec [Gem::Specification]
         # @return [Solargraph::Location, nil]
         def object_location code_object, spec
           return nil if spec.nil? || code_object.nil? || code_object.file.nil? || code_object.line.nil?

data/lib/solargraph/shell.rb

@@ -153,6 +153,7 @@ module Solargraph
         probcount += problems.length
       end
       puts "#{probcount} problem#{probcount != 1 ? 's' : ''} found#{files.length != 1 ? " in #{filecount} of #{files.length} files" : ''}."
+      exit 1 if probcount > 0
     end
 
     desc 'scan', 'Test the workspace for problems'

data/lib/solargraph/source/chain.rb

@@ -110,18 +110,21 @@ module Solargraph
       # @param api_map [ApiMap]
       # @return [ComplexType]
       def infer_first_defined pins, context, api_map
-        type = ComplexType::UNDEFINED
+        possibles = []
         pins.each do |pin|
           # Avoid infinite recursion
           next if @@inference_stack.include?(pin.identity)
           @@inference_stack.push pin.identity
           type = pin.typify(api_map)
           @@inference_stack.pop
-          break if type.defined?
+          if type.defined?
+            possibles.push type
+            break if pin.is_a?(Pin::BaseMethod)
+          end
         end
-        if type.undefined?
+        if possibles.empty?
           # Limit method inference recursion
-          return type if @@inference_depth >= 10 && pins.first.is_a?(Pin::BaseMethod)
+          return ComplexType::UNDEFINED if @@inference_depth >= 10 && pins.first.is_a?(Pin::BaseMethod)
           @@inference_depth += 1
           pins.each do |pin|
             # Avoid infinite recursion
@@ -129,10 +132,20 @@ module Solargraph
             @@inference_stack.push pin.identity
             type = pin.probe(api_map)
             @@inference_stack.pop
-            break if type.defined?
+            if type.defined?
+              possibles.push type
+              break if pin.is_a?(Pin::BaseMethod)
+            end
           end
           @@inference_depth -= 1
         end
+        return ComplexType::UNDEFINED if possibles.empty?
+        type = if possibles.length > 1
+          sorted = possibles.map { |t| t.rooted? ? "::#{t}" : t.to_s }.sort { |a, _| a == 'nil' ? 1 : 0 }
+          ComplexType.parse(*sorted)
+        else
+          possibles.first
+        end
         return type if context.nil? || context.return_type.undefined?
         type.self_to(context.return_type.namespace)
       end

data/lib/solargraph/source_map/clip.rb

@@ -156,7 +156,7 @@ module Solargraph
 
       def tag_complete
         result = []
-        match = source_map.code[0..cursor.offset-1].match(/\[([a-z0-9_:]*)\z/i)
+        match = source_map.code[0..cursor.offset-1].match(/[\[<, ]([a-z0-9_:]*)\z/i)
         if match
           full = match[1]
           if full.include?('::')

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.39.12'
+  VERSION = '0.39.17'
 end

data/lib/solargraph/yard_map.rb

@@ -158,10 +158,12 @@ module Solargraph
       @cache ||= YardMap::Cache.new
     end
 
+    # @return [Hash]
     def pin_class_hash
       @pin_class_hash ||= pins.to_set.classify(&:class).transform_values(&:to_a)
     end
 
+    # @return [Array<Pin::Base>]
     def pins_by_class klass
       @pin_select_cache[klass] ||= pin_class_hash.select { |key, _| key <= klass }.values.flatten
     end

data/lib/solargraph/yard_map/mapper.rb

@@ -35,10 +35,10 @@ module Solargraph
             # This method of superclass detection is a bit of a hack. If
             # the superclass is a Proxy, it is assumed to be undefined in its
             # yardoc and converted to a fully qualified namespace.
-            if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
-              superclass = "::#{code_object.superclass}"
+            superclass = if code_object.superclass.is_a?(YARD::CodeObjects::Proxy)
+              "::#{code_object.superclass}"
             else
-              superclass = code_object.superclass.to_s
+              code_object.superclass.to_s
             end
             result.push Solargraph::Pin::Reference::Superclass.new(name: superclass, closure: nspin)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.12
+  version: 0.39.17
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport