solargraph 0.39.8 → 0.39.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17711680892b43f0ee8848707305dfdb801e7fc15f65e3426fab759dc0309c20
-  data.tar.gz: 6e8a9089d203ef9a405da33e449f3c4291d57d741e0bde5d615ecc629276a60a
+  metadata.gz: 005ae6488ba3fec9c5cd26d961b60ee1085a3020e3e52819b7da9351a6480cdd
+  data.tar.gz: 0f8bf29d0c2d6a4577d4432cf89209d037d51186a5b709869fbcce793e98763e
 SHA512:
-  metadata.gz: 33685a93c52c6417d88f07a76dd4af8c77bf6446d551615e3a745462c622a7808b200638d0af8dbe269cd41c92cac6ba234bb86c29bf7f385ff9d39dd1155ff7
-  data.tar.gz: a53bfd06eb1d3e56564ca03b434ba48169e2f56e7712d7eda0f26f67a3830741a70729df280cc80414d69e6586034cbdb7eea11bf31ee87a83a1eabe3b04da05
+  metadata.gz: 656cf961069df0d647886a0ea0555182a0be4c3fc3794ed0b70c41decee645ef76cdec1240c6e1c0d389fab842ce33a0dba6df74c49a59efc04359963d2e848d
+  data.tar.gz: 1cb435e7a3b218fde5a0d3e3c9b5f27d376157fd7f316cd29cb4711de81fd5bac133b41c6e95b72249ec11d616fc98d13f6a5486d75b5dedede21e7bd12b43db

data/lib/solargraph/library.rb

@@ -339,7 +339,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/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/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/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.11'
 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.11
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport