solargraph 0.39.2 → 0.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b985b34fe6875e7ed506ce66d11f3a43d876008e69b3d76a9095deaee29da027
-  data.tar.gz: b851f7d46f241e19beeba03e2612591633725b18c37191e85309dad252cf8698
+  metadata.gz: 7445b5b059ff10d5ff6b998209d3988a4d9f20b48b0b3e51b8e6b63000f18d1b
+  data.tar.gz: d17e09c8fecf38bb4bff9ca4d6985c898a2256cc6c56e4c54599b4be907e27b9
 SHA512:
-  metadata.gz: de8f14a59263f1438d8e66988d6f85583a9b89e026903a8a5151bd58ce78a2d23aa729b697eec32ee82e7d7635731938d6bd7206c4186224250eb1bd084741b9
-  data.tar.gz: a74dfbeb17fd6dc505dfa045fc5b840f9ac0605c16ff7968e2911a29a72cddd4475bd3db3d05cf548048b702920f9adf722977caad6b99d7d1541dc3b38f24a7
+  metadata.gz: 61ed8f3f9f68ce49f2496e5fe07eeefbc1121350c15827bc0d600a2417e041d4f2b5d89c861c2f3b4873c20e02bd8fa708d2697b3e73d8e0ee0c858cb7c0f090
+  data.tar.gz: 6c3646376224f2237e404e4c6fcea9eaf02eaa1cfedebf9a01b6f89896d6454c03b7cbbdc16255549b528243d4c7f73a491f7d94e2d5866c6d15bc18a6db0323

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

@@ -30,7 +30,7 @@ module Solargraph
               process_require
             elsif node.children[0] == :alias_method
               process_alias_method
-            elsif node.children[0] == :private_class_method && Parser.is_ast_node?(node)
+            elsif node.children[0] == :private_class_method
               # Processing a private class can potentially handle children on its own
               return if process_private_class_method
             elsif [:attr_reader, :attr_writer, :attr_accessor].include?(node.children[0])
@@ -270,6 +270,7 @@ module Solargraph
 
           # @return [Boolean]
           def process_private_class_method
+            return false unless Parser.is_ast_node?(node.children.last)
             if node.children.last.children.first.type == :DEFN
               process_children region.update(scope: :class, visibility: :private)
               true

data/lib/solargraph/source.rb

@@ -339,7 +339,7 @@ module Solargraph
     def first_not_empty_from line
       cursor = line
       cursor += 1 while cursor < code.lines.length && code.lines[cursor].strip.empty?
-      cursor = line if cursor > code.lines.length
+      cursor = line if cursor > code.lines.length - 1
       cursor
     end
 

data/lib/solargraph/source_map/mapper.rb

@@ -68,7 +68,7 @@ module Solargraph
         # @param d [YARD::Tags::Directive]
         parse.directives.each do |d|
           line_num = find_directive_line_number(cmnt, d.tag.tag_name, last_line)
-          pos = Solargraph::Position.new(comment_position.line + line_num, comment_position.column)
+          pos = Solargraph::Position.new(comment_position.line + line_num - 1, comment_position.column)
           process_directive(source_position, pos, d)
           last_line = line_num + 1
           # @todo The below call assumes the topmost comment line. The above
@@ -79,6 +79,8 @@ module Solargraph
         end
       end
 
+      # @param comment [String]
+      # @return [Integer]
       def find_directive_line_number comment, tag, start
         num = comment.lines[start..-1].find_index do |line|
           # Legacy method directives might be `@method` instead of `@!method`
@@ -96,7 +98,7 @@ module Solargraph
         location = Location.new(@filename, Range.new(comment_position, comment_position))
         case directive.tag.tag_name
         when 'method'
-          namespace = closure_at(source_position)
+          namespace = closure_at(source_position) || @pins.first
           if namespace.location.range.start.line < comment_position.line
             namespace = closure_at(comment_position)
           end
@@ -105,9 +107,9 @@ module Solargraph
             src_node = Parser.parse("def #{directive.tag.name};end", @filename, location.range.start.line)
             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 the it gets
-            # recognized as originating from a comment
-            shifted = Solargraph::Position.new(comment_position.line, @code.lines[comment_position.line].chomp.length)
+            # Move the location to the end of the line so it gets recognized
+            # as originating from a comment
+            shifted = Solargraph::Position.new(comment_position.line, @code.lines[comment_position.line].to_s.chomp.length)
             # @todo: Smelly instance variable access
             gen_pin.instance_variable_set(:@comments, docstring.all.to_s)
             gen_pin.instance_variable_set(:@location, Solargraph::Location.new(@filename, Range.new(shifted, shifted)))

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map.rb

@@ -110,52 +110,8 @@ module Solargraph
 
     # @return [Array<Solargraph::Pin::Base>]
     def core_pins
-      @@core_pins ||= begin
-        yd = CoreDocs.yardoc_file
-        ser = File.join(File.dirname(yd), 'core.ser')
-        result = []
-        if File.file?(ser)
-          file = File.open(ser, 'rb')
-          dump = file.read
-          file.close
-          result.concat Marshal.load(dump)
-        else
-          load_yardoc CoreDocs.yardoc_file
-          result.concat Mapper.new(YARD::Registry.all).map
-          # HACK: Assume core methods with a single `args` parameter accept restarg
-          result.select { |pin| pin.is_a?(Solargraph::Pin::BaseMethod )}.each do |pin|
-            if pin.parameters.length == 1 && pin.parameters.first.name == 'args' && pin.parameters.first.decl == :arg
-              # @todo Smelly instance variable access
-              pin.parameters.first.instance_variable_set(:@decl, :restarg)
-            end
-          end
-          # HACK: Set missing parameters on `==` methods, e.g., `Symbol#==`
-          result.select { |pin| pin.name == '==' && pin.parameters.empty? }.each do |pin|
-            pin.parameters.push Pin::Parameter.new(decl: :arg, name: 'obj2')
-          end
-          dump = Marshal.dump(result)
-          file = File.open(ser, 'wb')
-          file.write dump
-          file.close
-        end
-        # HACK: Add Errno exception classes
-        errno = result.select{ |pin| pin.path == 'Errno' }.first
-        Errno.constants.each do |const|
-          result.push Solargraph::Pin::Namespace.new(type: :class, name: const.to_s, closure: errno)
-          result.push Solargraph::Pin::Reference::Superclass.new(closure: result.last, name: 'SystemCallError')
-        end
-        CoreFills::OVERRIDES.each do |ovr|
-          pin = result.select { |p| p.path == ovr.name }.first
-          next if pin.nil?
-          (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
-            pin.docstring.delete_tags tag.to_sym
-          end
-          ovr.tags.each do |tag|
-            pin.docstring.add_tag(tag)
-          end
-        end
-        result
-      end
+      # Using a class variable to reduce loads
+      @@core_pins ||= load_core_pins
     end
 
     # @param path [String]
@@ -237,31 +193,12 @@ module Solargraph
           base = r.split('/').first
           next if from_std.include?(base)
           from_std.push base
-          stdtmp = []
-          ser = File.join(File.dirname(CoreDocs.yardoc_stdlib_file), "#{base}.ser")
-          if File.file?(ser)
-            Solargraph.logger.info "Loading #{base} stdlib from cache"
-            file = File.open(ser, 'rb')
-            dump = file.read
-            file.close
-            stdtmp.concat Marshal.load(dump)
-          else
-            if stdlib_paths[base]
-              Solargraph.logger.info "Loading #{base} stdlib from yardoc"
-              stdtmp.concat Mapper.new(stdlib_paths[base]).map
-              next if stdtmp.empty?
-              dump = Marshal.dump(stdtmp)
-              file = File.open(ser, 'wb')
-              file.write dump
-              file.close
-            end
-          end
+          stdtmp = load_stdlib_pins(base)
           if stdtmp.empty?
             unresolved_requires.push r
           else
             stdlib_fill base, stdtmp
             result.concat stdtmp
-            # stdnames[r] = stdtmp
           end
         end
         result.delete_if(&:nil?)
@@ -270,7 +207,6 @@ module Solargraph
           pins.concat result
         end
       end
-      # pins.concat process_stdlib(stdnames)
       pins.concat core_pins
     end
 
@@ -316,7 +252,12 @@ module Solargraph
           file = File.open(ser, 'rb')
           dump = file.read
           file.close
-          return Marshal.load(dump)
+          begin
+            return Marshal.load(dump)
+          rescue StandardError => e
+            Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
+            File.unlink ser
+          end
         end
       end
       if !size.nil? && size > 20_000_000
@@ -379,6 +320,98 @@ module Solargraph
         end
       end
     end
+
+    def load_core_pins
+      yd = CoreDocs.yardoc_file
+      ser = File.join(File.dirname(yd), 'core.ser')
+      result = if File.file?(ser)
+        file = File.open(ser, 'rb')
+        dump = file.read
+        file.close
+        begin
+          Marshal.load(dump)
+        rescue StandardError => e
+          Solargraph.logger.warn "Error loading core pin cache: [#{e.class}] #{e.message}"
+          File.unlink ser
+          read_core_and_save_cache(yd, ser)
+        end
+      else
+        read_core_and_save_cache(yd, ser)
+      end
+      # HACK: Add Errno exception classes
+      errno = result.select{ |pin| pin.path == 'Errno' }.first
+      Errno.constants.each do |const|
+        result.push Solargraph::Pin::Namespace.new(type: :class, name: const.to_s, closure: errno)
+        result.push Solargraph::Pin::Reference::Superclass.new(closure: result.last, name: 'SystemCallError')
+      end
+      CoreFills::OVERRIDES.each do |ovr|
+        pin = result.select { |p| p.path == ovr.name }.first
+        next if pin.nil?
+        (ovr.tags.map(&:tag_name) + ovr.delete).uniq.each do |tag|
+          pin.docstring.delete_tags tag.to_sym
+        end
+        ovr.tags.each do |tag|
+          pin.docstring.add_tag(tag)
+        end
+      end
+      result
+    end
+
+    def read_core_and_save_cache yd, ser
+      result = []
+      load_yardoc yd
+      result.concat Mapper.new(YARD::Registry.all).map
+      # HACK: Assume core methods with a single `args` parameter accept restarg
+      result.select { |pin| pin.is_a?(Solargraph::Pin::BaseMethod )}.each do |pin|
+        if pin.parameters.length == 1 && pin.parameters.first.name == 'args' && pin.parameters.first.decl == :arg
+          # @todo Smelly instance variable access
+          pin.parameters.first.instance_variable_set(:@decl, :restarg)
+        end
+      end
+      # HACK: Set missing parameters on `==` methods, e.g., `Symbol#==`
+      result.select { |pin| pin.name == '==' && pin.parameters.empty? }.each do |pin|
+        pin.parameters.push Pin::Parameter.new(decl: :arg, name: 'obj2')
+      end
+      dump = Marshal.dump(result)
+      file = File.open(ser, 'wb')
+      file.write dump
+      file.close
+      result
+    end
+
+    def load_stdlib_pins base
+      ser = File.join(File.dirname(CoreDocs.yardoc_stdlib_file), "#{base}.ser")
+      if File.file?(ser)
+        Solargraph.logger.info "Loading #{base} stdlib from cache"
+        file = File.open(ser, 'rb')
+        dump = file.read
+        file.close
+        begin
+          Marshal.load(dump)
+        rescue StandardError => e
+          Solargraph.logger.warn "Error loading #{base} stdlib pin cache: [#{e.class}] #{e.message}"
+          File.unlink ser
+          read_stdlib_and_save_cache(base, ser)
+        end
+      else
+        read_stdlib_and_save_cache(base, ser)
+      end
+    end
+
+    def read_stdlib_and_save_cache base, ser
+      result = []
+      if stdlib_paths[base]
+        Solargraph.logger.info "Loading #{base} stdlib from yardoc"
+        result.concat Mapper.new(stdlib_paths[base]).map
+        unless result.empty?
+          dump = Marshal.dump(result)
+          file = File.open(ser, 'wb')
+          file.write dump
+          file.close
+        end
+      end
+      result
+    end
   end
 end
 

metadata

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