solargraph 0.39.8 → 0.39.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17711680892b43f0ee8848707305dfdb801e7fc15f65e3426fab759dc0309c20
-  data.tar.gz: 6e8a9089d203ef9a405da33e449f3c4291d57d741e0bde5d615ecc629276a60a
+  metadata.gz: b06a4823fe5895875513bafc0192b627ecc2a5eff460bdc4e9bd511e8d31ecda
+  data.tar.gz: e5cfad1cfaa75dec019e2a772297c4f5c936370a9dcb49d1a61ae1e9e0529581
 SHA512:
-  metadata.gz: 33685a93c52c6417d88f07a76dd4af8c77bf6446d551615e3a745462c622a7808b200638d0af8dbe269cd41c92cac6ba234bb86c29bf7f385ff9d39dd1155ff7
-  data.tar.gz: a53bfd06eb1d3e56564ca03b434ba48169e2f56e7712d7eda0f26f67a3830741a70729df280cc80414d69e6586034cbdb7eea11bf31ee87a83a1eabe3b04da05
+  metadata.gz: 3e169cdfe2badf421a2323c6e796d346dea9c17f1b919a2d96de47ac7f1d0a3ebc77a799ac1ff7f44022b6621c01936fb31178ec9db56ea0b6ee63f44e279f47
+  data.tar.gz: 1c7783cd9b43ed4b9dc29a30fea180c10c9440961a630e7180f4101bcc064b40db9fd9018b5d94594cf061c9b993402cf18ffdcff3a4537f0366dd6f29992865

data/SPONSORS.md

@@ -4,6 +4,11 @@ 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
+- Tom de Grunt

data/lib/solargraph/api_map.rb

@@ -423,7 +423,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 = []

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -26,10 +26,10 @@ module Solargraph
               store = RuboCop::ConfigStore.new
               redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
               result = File.read(tempfile)
-              File.unlink tempfile
               format original, result
             rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
               set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
+            ensure
               File.unlink tempfile
             end
           end

data/lib/solargraph/library.rb

@@ -171,7 +171,21 @@ module Solargraph
     def definitions_at filename, line, column
       position = Position.new(line, column)
       cursor = Source::Cursor.new(read(filename), position)
-      api_map.clip(cursor).define.map { |pin| pin.realize(api_map) }
+      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)
+        if lft && rgt
+          tag = lft[1] + rgt[1]
+          clip = api_map.clip(cursor)
+          clip.translate tag
+        else
+          []
+        end
+      else
+        api_map.clip(cursor).define.map { |pin| pin.realize(api_map) }
+      end
     end
 
     # Get signature suggestions for the method at the specified file and
@@ -245,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
@@ -339,7 +353,7 @@ module Solargraph
         logger.info "Cataloging #{workspace.directory.empty? ? 'generic workspace' : workspace.directory}"
         api_map.catalog bundle
         @synchronized = true
-        logger.info "Catalog complete (#{api_map.pins.length} pins)"
+        logger.info "Catalog complete (#{api_map.source_maps.length} files, #{api_map.pins.length} pins)" if logger.info?
       end
     end
 

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

@@ -124,7 +124,9 @@ module Solargraph
           result = []
           if node.type == :block
             result.push node
-            node.children[0].children[2..-1].each { |child| result.concat call_nodes_from(child) }
+            if Parser.is_ast_node?(node.children[0]) && node.children[0].children.length > 2
+              node.children[0].children[2..-1].each { |child| result.concat call_nodes_from(child) }
+            end
             node.children[1..-1].each { |child| result.concat call_nodes_from(child) }
           elsif node.type == :send
             result.push node

data/lib/solargraph/pin/documenting.rb

@@ -53,13 +53,14 @@ module Solargraph
         # @param text [String]
         # @return [String]
         def escape_brackets text
-          text.gsub(/(\[[^\]]*\])([^\(]|\z)/, '!!!`\1`!!!\2')
+          # text.gsub(/(\[[^\]]*\])([^\(]|\z)/, '!!!^\1^!!!\2')
+          text.gsub('[', '!!!!b').gsub(']', 'e!!!!')
         end
 
         # @param text [String]
         # @return [String]
         def unescape_brackets text
-          text.gsub('!!!`[', '[').gsub(']`!!!', ']')
+          text.gsub('!!!!b', '[').gsub('e!!!!', ']')
         end
       end
 

data/lib/solargraph/pin/method.rb

@@ -5,7 +5,7 @@ module Solargraph
     class Method < BaseMethod
       include Solargraph::Parser::NodeMethods
 
-      # @return [Array<String>]
+      # @return [Array<Pin::Parameter>]
       attr_reader :parameters
 
       # @param args [Array<String>]

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]
         end
 
+        # @param a [Array]
+        # @return [Symbol]
         def arg_type a
           if a[0].start_with?('**')
             :kwrestarg

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/source/chain/z_super.rb

@@ -18,166 +18,12 @@ module Solargraph
           super(word, [], with_block)
         end
 
-        def with_block?
-          @with_block
-        end
-
         # @param api_map [ApiMap]
         # @param name_pin [Pin::Base]
         # @param locals [Array<Pin::Base>]
         def resolve api_map, name_pin, locals
           return super_pins(api_map, name_pin)
         end
-
-        private
-
-        # @param pins [Array<Pin::Base>]
-        # @param api_map [ApiMap]
-        # @param context [ComplexType]
-        # @param locals [Pin::LocalVariable]
-        # @return [Array<Pin::Base>]
-        def inferred_pins pins, api_map, context, locals
-          result = pins.map do |p|
-            overloads = p.docstring.tags(:overload)
-            # next p if overloads.empty?
-            type = ComplexType::UNDEFINED
-            # @param [YARD::Tags::OverloadTag]
-            overloads.each do |ol|
-              next unless arguments_match(arguments, ol.parameters)
-              next if ol.parameters.last && ol.parameters.last.first.start_with?('&') && ol.parameters.last.last.nil? && !with_block?
-              match = true
-              arguments.each_with_index do |arg, idx|
-                achain = arguments[idx]
-                next if achain.nil?
-                param = ol.parameters[idx]
-                if param.nil?
-                  match = false unless ol.parameters.last && ol.parameters.last.first.start_with?('*')
-                  break
-                end
-                par = ol.tags(:param).select { |pp| pp.name == param.first }.first
-                next if par.nil? || par.types.nil? || par.types.empty?
-                atype = achain.infer(api_map, Pin::ProxyType.anonymous(context), locals)
-                other = ComplexType.try_parse(*par.types)
-                # @todo Weak type comparison
-                unless atype.tag == other.tag || api_map.super_and_sub?(other.tag, atype.tag)
-                  match = false
-                  break
-                end
-              end
-              if match
-                type = extra_return_type(ol, context)
-                type = ComplexType.try_parse(*ol.tag(:return).types).self_to(context.to_s).qualify(api_map, context.namespace) if ol.has_tag?(:return) && ol.tag(:return).types && !ol.tag(:return).types.empty? && (type.nil? || type.undefined?)
-                type ||= ComplexType::UNDEFINED
-              end
-              break if type.defined?
-            end
-            next p.proxy(type) if type.defined?
-            type = extra_return_type(p.docstring, context)
-            if type
-              next Solargraph::Pin::Method.new(
-                location: p.location,
-                closure: p.closure,
-                name: p.name,
-                comments: "@return [#{context.subtypes.first.to_s}]",
-                scope: p.scope,
-                visibility: p.visibility,
-                parameters: p.parameters,
-                node: p.node
-              )
-            end
-            if p.is_a?(Pin::Method) && !p.macros.empty?
-              result = process_macro(p, api_map, context, locals)
-              next result unless result.return_type.undefined?
-            elsif !p.directives.empty?
-              result = process_directive(p, api_map, context, locals)
-              next result unless result.return_type.undefined?
-            end
-            p
-          end
-          result.map do |pin|
-            next pin if pin.return_type.undefined?
-            selfy = pin.return_type.self_to(context.tag)
-            selfy == pin.return_type ? pin : pin.proxy(selfy)
-          end
-        end
-
-        # @param pin [Pin::Method]
-        # @param api_map [ApiMap]
-        # @param context [ComplexType]
-        # @param locals [Pin::Base]
-        # @return [Pin::Base]
-        def process_macro pin, api_map, context, locals
-          pin.macros.each do |macro|
-            result = inner_process_macro(pin, macro, api_map, context, locals)
-            return result unless result.return_type.undefined?
-          end
-          Pin::ProxyType.anonymous(ComplexType::UNDEFINED)
-        end
-
-        # @param pin [Pin::Method]
-        # @param api_map [ApiMap]
-        # @param context [ComplexType]
-        # @param locals [Pin::Base]
-        # @return [Pin::ProxyType]
-        def process_directive pin, api_map, context, locals
-          pin.directives.each do |dir|
-            macro = api_map.named_macro(dir.tag.name)
-            next if macro.nil?
-            result = inner_process_macro(pin, macro, api_map, context, locals)
-            return result unless result.return_type.undefined?
-          end
-          Pin::ProxyType.anonymous ComplexType::UNDEFINED
-        end
-
-        # @param pin [Pin]
-        # @param macro [YARD::Tags::MacroDirective]
-        # @param api_map [ApiMap]
-        # @param context [ComplexType]
-        # @param locals [Array<Pin::Base>]
-        # @return [Pin::ProxyType]
-        def inner_process_macro pin, macro, api_map, context, locals
-          vals = arguments.map{ |c| Pin::ProxyType.anonymous(c.infer(api_map, pin, locals)) }
-          txt = macro.tag.text.clone
-          if txt.empty? && macro.tag.name
-            named = api_map.named_macro(macro.tag.name)
-            txt = named.tag.text.clone if named
-          end
-          i = 1
-          vals.each do |v|
-            txt.gsub!(/\$#{i}/, v.context.namespace)
-            i += 1
-          end
-          docstring = Solargraph::Source.parse_docstring(txt).to_docstring
-          tag = docstring.tag(:return)
-          unless tag.nil? || tag.types.nil?
-            return Pin::ProxyType.anonymous(ComplexType.try_parse(*tag.types))
-          end
-          Pin::ProxyType.anonymous(ComplexType::UNDEFINED)
-        end
-
-        # @param docstring [YARD::Docstring]
-        # @param context [ComplexType]
-        # @return [ComplexType]
-        def extra_return_type docstring, context
-          if docstring.has_tag?(:return_single_parameter) && context.subtypes.one?
-            return context.subtypes.first
-          elsif docstring.has_tag?(:return_value_parameter) && context.value_types.one?
-            return context.value_types.first
-          end
-          nil
-        end
-
-        # @param arguments [Array<Chain>]
-        # @param parameters [Array<String>]
-        # @return [Boolean]
-        def arguments_match arguments, parameters
-          argcount = arguments.length
-          # argcount -= 1 if !arguments.empty? && arguments.last.links.first.word.start_with?('&')
-          parcount = parameters.length
-          parcount -= 1 if !parameters.empty? && parameters.last.first.start_with?('&')
-          return false if argcount < parcount && !(argcount == parcount - 1 && parameters.last.first.start_with?('*'))
-          true
-        end
       end
     end
   end

data/lib/solargraph/source_map.rb

@@ -76,6 +76,7 @@ module Solargraph
     # @param query [String]
     # @return [Array<Pin::Base>]
     def query_symbols query
+      return document_symbols if query && query.empty?
       document_symbols.select{ |pin| fuzzy_string_match(pin.path, query) || fuzzy_string_match(pin.name, query) }
     end
 

data/lib/solargraph/source_map/clip.rb

@@ -25,51 +25,12 @@ module Solargraph
       def complete
         return package_completions([]) if !source_map.source.parsed? || cursor.string?
         return package_completions(api_map.get_symbols) if cursor.chain.literal? && cursor.chain.links.last.word == '<Symbol>'
-        return Completion.new([], cursor.range) if cursor.chain.literal? || cursor.comment?
-        result = []
-        result.concat complete_keyword_parameters
-        if cursor.chain.constant? || cursor.start_of_constant?
-          full = cursor.chain.links.first.word
-          type = if cursor.chain.undefined?
-            cursor.chain.base.infer(api_map, context_pin, locals)
-          else
-            if full.include?('::') && cursor.chain.links.length == 1
-              ComplexType.try_parse(full.split('::')[0..-2].join('::'))
-            elsif cursor.chain.links.length > 1
-              ComplexType.try_parse(full)
-            else
-              ComplexType::UNDEFINED
-            end
-          end
-          if type.undefined?
-            if full.include?('::')
-              result.concat api_map.get_constants(full, *gates)
-            else
-              result.concat api_map.get_constants('', cursor.start_of_constant? ? '' : context_pin.full_context.namespace, *gates) #.select { |pin| pin.name.start_with?(full) }
-            end
-          else
-            result.concat api_map.get_constants(type.namespace, cursor.start_of_constant? ? '' : context_pin.full_context.namespace, *gates)
-          end
+        return Completion.new([], cursor.range) if cursor.chain.literal?
+        if cursor.comment?
+          tag_complete
         else
-          type = cursor.chain.base.infer(api_map, block, locals)
-          result.concat api_map.get_complex_type_methods(type, block.binder.namespace, cursor.chain.links.length == 1)
-          if cursor.chain.links.length == 1
-            if cursor.word.start_with?('@@')
-              return package_completions(api_map.get_class_variable_pins(context_pin.full_context.namespace))
-            elsif cursor.word.start_with?('@')
-              return package_completions(api_map.get_instance_variable_pins(block.binder.namespace, block.binder.scope))
-            elsif cursor.word.start_with?('$')
-              return package_completions(api_map.get_global_variable_pins)
-            end
-            result.concat locals
-            result.concat api_map.get_constants(context_pin.context.namespace, *gates)
-            result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
-            result.concat api_map.get_methods('Kernel')
-            result.concat ApiMap.keywords
-            result.concat yielded_self_pins
-          end
+          code_complete
         end
-        package_completions(result)
       end
 
       # @return [Array<Pin::Base>]
@@ -111,6 +72,13 @@ module Solargraph
         end
       end
 
+      # @param phrase [String]
+      # @return [Array<Solargraph::Pin::Base>]
+      def translate phrase
+        chain = Parser.chain(Parser.parse(phrase))
+        chain.define(api_map, block, locals)
+      end
+
       private
 
       # @return [ApiMap]
@@ -185,6 +153,71 @@ module Solargraph
         }
         Completion.new(filtered, cursor.range)
       end
+
+      def tag_complete
+        result = []
+        match = source_map.code[0..cursor.offset-1].match(/[\[<, ]([a-z0-9_:]*)\z/i)
+        if match
+          full = match[1]
+          if full.include?('::')
+            if full.end_with?('::')
+              result.concat api_map.get_constants(full[0..-3], *gates)
+            else
+              result.concat api_map.get_constants(full.split('::')[0..-2].join('::'), *gates)
+            end
+          else
+            result.concat api_map.get_constants('', full.end_with?('::') ? '' : context_pin.full_context.namespace, *gates) #.select { |pin| pin.name.start_with?(full) }
+          end
+        end
+        package_completions(result)
+      end
+
+      def code_complete
+        result = []
+        result.concat complete_keyword_parameters
+        if cursor.chain.constant? || cursor.start_of_constant?
+          full = cursor.chain.links.first.word
+          type = if cursor.chain.undefined?
+            cursor.chain.base.infer(api_map, context_pin, locals)
+          else
+            if full.include?('::') && cursor.chain.links.length == 1
+              ComplexType.try_parse(full.split('::')[0..-2].join('::'))
+            elsif cursor.chain.links.length > 1
+              ComplexType.try_parse(full)
+            else
+              ComplexType::UNDEFINED
+            end
+          end
+          if type.undefined?
+            if full.include?('::')
+              result.concat api_map.get_constants(full, *gates)
+            else
+              result.concat api_map.get_constants('', cursor.start_of_constant? ? '' : context_pin.full_context.namespace, *gates) #.select { |pin| pin.name.start_with?(full) }
+            end
+          else
+            result.concat api_map.get_constants(type.namespace, cursor.start_of_constant? ? '' : context_pin.full_context.namespace, *gates)
+          end
+        else
+          type = cursor.chain.base.infer(api_map, block, locals)
+          result.concat api_map.get_complex_type_methods(type, block.binder.namespace, cursor.chain.links.length == 1)
+          if cursor.chain.links.length == 1
+            if cursor.word.start_with?('@@')
+              return package_completions(api_map.get_class_variable_pins(context_pin.full_context.namespace))
+            elsif cursor.word.start_with?('@')
+              return package_completions(api_map.get_instance_variable_pins(block.binder.namespace, block.binder.scope))
+            elsif cursor.word.start_with?('$')
+              return package_completions(api_map.get_global_variable_pins)
+            end
+            result.concat locals
+            result.concat api_map.get_constants(context_pin.context.namespace, *gates)
+            result.concat api_map.get_methods(block.binder.namespace, scope: block.binder.scope, visibility: [:public, :private, :protected])
+            result.concat api_map.get_methods('Kernel')
+            result.concat ApiMap.keywords
+            result.concat yielded_self_pins
+          end
+        end
+        package_completions(result)
+      end
     end
   end
 end

data/lib/solargraph/source_map/mapper.rb

@@ -95,6 +95,7 @@ module Solargraph
       # @param source_position [Position]
       # @param comment_position [Position]
       # @param directive [YARD::Tags::Directive]
+      # @return [void]
       def process_directive source_position, comment_position, directive
         docstring = Solargraph::Source.parse_docstring(directive.tag.text).to_docstring
         location = Location.new(@filename, Range.new(comment_position, comment_position))
@@ -104,10 +105,10 @@ module Solargraph
           if namespace.location.range.start.line < comment_position.line
             namespace = closure_at(comment_position)
           end
-          region = Parser::Region.new(source: @source, closure: namespace)
           begin
-            src_node = Parser.parse("def #{directive.tag.name};end", @filename, location.range.start.line)
-            gen_pin = Parser.process_node(src_node, region).first.last
+            src = Solargraph::Source.load_string("def #{directive.tag.name};end", @source.filename)
+            region = Parser::Region.new(source: src, closure: namespace)
+            gen_pin = Parser.process_node(src.node, region).first.last
             return if gen_pin.nil?
             # Move the location to the end of the line so it gets recognized
             # as originating from a comment
@@ -148,12 +149,23 @@ module Solargraph
             )
           end
         when 'parse'
-          ns = closure_at(source_position)
-          region = Parser::Region.new(source: @source, closure: ns)
           begin
-            node = Parser.parse(directive.tag.text, @filename, comment_position.line)
+            ns = closure_at(source_position)
+            src = Solargraph::Source.load_string(directive.tag.text, @source.filename)
+            region = Parser::Region.new(source: src, closure: ns)
             # @todo These pins may need to be marked not explicit
-            Parser.process_node(node, region, @pins)
+            index = @pins.length
+            loff = if @code.lines[comment_position.line].strip.end_with?('@!parse')
+              comment_position.line + 1
+            else
+              comment_position.line
+            end
+            Parser.process_node(src.node, region, @pins)
+            @pins[index..-1].each do |p|
+              # @todo Smelly instance variable access
+              p.location.range.start.instance_variable_set(:@line, p.location.range.start.line + loff)
+              p.location.range.ending.instance_variable_set(:@line, p.location.range.ending.line + loff)
+            end
           rescue Parser::SyntaxError => e
             # @todo Handle parser errors in !parse directives
           end
@@ -190,7 +202,7 @@ module Solargraph
         code_lines = @code.lines
         @source.associated_comments.each do |line, comments|
           src_pos = line ? Position.new(line, code_lines[line].to_s.chomp.index(/[^\s]/) || 0) : Position.new(code_lines.length, 0)
-          com_pos = Position.new(line - 1, 0)
+          com_pos = Position.new(line + 1 - comments.lines.length, 0)
           process_comment(src_pos, com_pos, comments)
         end
       end

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map/rdoc_to_yard.rb

@@ -15,23 +15,23 @@ module Solargraph
       # @return [void]
       def self.run spec, cache_dir: nil
         Dir.mktmpdir do |tmpdir|
-          rdir = File.join(tmpdir, 'rdoc')
-          Dir.chdir spec.full_gem_path do
+          rdir = File.join(tmpdir, 'sg_tmp_rdoc')
+          FileUtils.cp_r Dir.glob(File.join(spec.full_gem_path, '*')), tmpdir
+          Dir.chdir tmpdir do
             pins = []
             pins.push Solargraph::Pin::ROOT_PIN
             name_hash = {}
 
-            argv = ['-q', '-N', '-r', '-o', rdir]
+            argv = ['-q', '-r', '-N', '-o', rdir]
             spec.load_paths.each do |path|
               argv.concat ['-i', path]
             end
             rdoc = RDoc::RDoc.new
             rdoc.document argv
-
-            store = RDoc::Store.new(rdir)
-            store.load_all
+            # @type [RDoc::Store]
+            store = rdoc.store
+            store.path = rdir
             store.cache[:modules].each do |mod|
-              # store.load_class(mod)
               # @type [RDoc::NormalClass]
               mod = store.find_class_or_module(mod)
               closure = pins.select { |pin| pin.path == mod.full_name.split('::')[0..-2].join('::') }.first || pins.first
@@ -51,7 +51,7 @@ module Solargraph
                   closure: namepin
                 )
               end
-              # @param inc [RDoc::Extend]
+              # @param ext [RDoc::Extend]
               mod.extends.each do |ext|
                 pins.push Solargraph::Pin::Reference::Extend.new(
                   location: locate(ext),
@@ -105,7 +105,11 @@ module Solargraph
         mod.full_name.split('::')[0..-2].join('::')
       end
 
+      # @param cmnt [RDoc::Comment]
+      # @return [String]
       def self.commentary cmnt
+        return cmnt if cmnt.is_a?(String)
+        return cmnt.text if cmnt.is_a?(RDoc::Comment)
         result = []
         cmnt.parts.each do |part|
           result.push RDoc::Markup::ToHtml.new({}).to_html(part.text) if part.respond_to?(:text)
@@ -126,9 +130,9 @@ module Solargraph
 
       def self.find_file obj
         if obj.respond_to?(:in_files) && !obj.in_files.empty?
-          [obj.in_files.first.to_s.sub(/^file /, ''), obj.in_files.first.line]
+          [obj.in_files.first.to_s.sub(/^file /, ''), obj.line]
         else
-          [obj.file_name, obj.line]
+          [obj.file, obj.line]
         end
       end
     end

metadata

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