solargraph 0.42.3 → 0.42.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99f80989cced14064f1739f7a193f207fe92c8f696374de2f4798e3662196f0
-  data.tar.gz: efb7011bebf1eaab6b374c093fe25abe67a7b5da469024d78702feae1e4449a3
+  metadata.gz: 28ad96860cdfaaa7ce608149d111164649664a86e13567c63efb0218cac98bff
+  data.tar.gz: 12f96ea8a87a97a98e0f91774bff44ff3c736fe5268cbdb959cfbf0ce70c53b6
 SHA512:
-  metadata.gz: b3975f82cf5ac9c25e6d49dfe5cee21fc780d98f38dfca83371750c8a7913d53684d142f21047fcf132cdb7e02efb878b8956aab94b982ae764a3dcae9bf62cc
-  data.tar.gz: 6917cfd70a9d436792456857154b6de5c10ded3d08f3ae9caf029307581577fcd1d1934fe3959c5c84750006d9e3d6a55c4a344746dee72eb8fa9dcf3a25e078
+  metadata.gz: '00259fb37ec37b1090797678288f75fc9e1fd26db368d11f6e98f6c89b78745141d416a6a40cc507ce1f032056318c9f67946d9a6d9e17646aee0c9b54a1fd5d'
+  data.tar.gz: 264c5b2e39c4f946f9e375b7d5ef17f97d42c7b6343aa632f1c0319e1a2c6b2b2d73dc50f31b7b863b55b814e0b089cfae63137e8548927e2e0935c4e3243402

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.42.4
+- Yardoc cache handling
+- Fix required_paths when gemspec is used (#451)
+- fix: yard stdout may break language client (#454)
+
 ## 0.42.3 - June 14, 2021
 - Require 'pathname' for Library
 

data/SPONSORS.md

@@ -13,4 +13,3 @@ The following people and organizations provide funding or other resources. [Beco
 - Emily Strickland
 - Tom de Grunt
 - Akira Yamada
-- Jared White

data/lib/solargraph/library.rb

@@ -351,7 +351,7 @@ module Solargraph
         else
           args = line.split(':').map(&:strip)
           name = args.shift
-            reporter = Diagnostics.reporter(name)
+          reporter = Diagnostics.reporter(name)
           raise DiagnosticsError, "Diagnostics reporter #{name} does not exist" if reporter.nil?
           repargs[reporter] ||= []
           repargs[reporter].concat args

data/lib/solargraph/parser/node_processor/base.rb

@@ -4,9 +4,6 @@ module Solargraph
   module Parser
     module NodeProcessor
       class Base
-        # @todo The base node processor should not include legacy node methods
-        # include Legacy::NodeMethods
-
         # @return [Parser::AST::Node]
         attr_reader :node
 

data/lib/solargraph/source.rb

@@ -6,19 +6,15 @@ module Solargraph
   # A Ruby file that has been parsed into an AST.
   #
   class Source
-    # autoload :FlawedBuilder, 'solargraph/source/flawed_builder'
     autoload :Updater,       'solargraph/source/updater'
     autoload :Change,        'solargraph/source/change'
     autoload :Mapper,        'solargraph/source/mapper'
-    # autoload :NodeMethods,   'solargraph/source/node_methods'
     autoload :EncodingFixes, 'solargraph/source/encoding_fixes'
     autoload :Cursor,        'solargraph/source/cursor'
     autoload :Chain,         'solargraph/source/chain'
     autoload :SourceChainer, 'solargraph/source/source_chainer'
-    # autoload :NodeChainer,   'solargraph/source/node_chainer'
 
     include EncodingFixes
-    # include NodeMethods
 
     # @return [String]
     attr_reader :filename
@@ -50,17 +46,9 @@ module Solargraph
         @node, @comments = Solargraph::Parser.parse_with_comments(@code, filename)
         @parsed = true
       rescue Parser::SyntaxError, EncodingError => e
-        # @todo 100% whitespace results in a nil node, so there's no reason to parse it.
-        #   We still need to determine whether the resulting node should be nil or a dummy
-        #   node with a location that encompasses the range.
-        # @node, @comments = Source.parse_with_comments(@code.gsub(/[^\s]/, ' '), filename)
         @node = nil
         @comments = {}
         @parsed = false
-      # rescue Exception => e
-      #   Solargraph.logger.warn "[#{e.class}] #{e.message}"
-      #   Solargraph.logger.warn e.backtrace.join("\n")
-      #   raise "Error parsing #{filename || '(source)'}: [#{e.class}] #{e.message}"
       ensure
         @code.freeze
       end

data/lib/solargraph/source/chain.rb

@@ -61,10 +61,6 @@ module Solargraph
         working_pin = name_pin
         links[0..-2].each do |link|
           pins = link.resolve(api_map, working_pin, locals)
-          # Locals are only used when resolving the first link
-          # @todo There's a problem here. Call links need to resolve arguments
-          #   that might refer to local variables.
-          # locals = []
           type = infer_first_defined(pins, working_pin, api_map)
           return [] if type.undefined?
           working_pin = Pin::ProxyType.anonymous(type)

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -183,7 +183,7 @@ module Solargraph
           end
         end
       end
-      result.concat config.require_paths
+      result.concat(config.require_paths.map { |p| File.join(directory, p) })
       result.push File.join(directory, 'lib') if result.empty?
       result
     end

data/lib/solargraph/yard_map.rb

@@ -288,9 +288,6 @@ module Solargraph
     # @return [Array<Pin::Base>]
     def process_yardoc y, spec = nil
       return [] if y.nil?
-      size = Dir.glob(File.join(y, '**', '*'))
-        .map{ |f| File.size(f) }
-        .inject(:+)
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
         if File.file?(ser)
@@ -299,19 +296,24 @@ module Solargraph
           dump = file.read
           file.close
           begin
-            return Marshal.load(dump)
+            result = Marshal.load(dump)
+            return result unless result.nil? || result.empty?
+            Solargraph.logger.warn "Empty cache for #{spec.name} #{spec.version}. Reloading"
           rescue StandardError => e
             Solargraph.logger.warn "Error loading pin cache: [#{e.class}] #{e.message}"
             File.unlink ser
           end
         end
       end
+      size = Dir.glob(File.join(y, '**', '*'))
+        .map{ |f| File.size(f) }
+        .inject(:+)
       if !size.nil? && size > 20_000_000
         Solargraph::Logging.logger.warn "Yardoc at #{y} is too large to process (#{size} bytes)"
         return []
       end
+      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from #{y}"
       load_yardoc y
-      Solargraph.logger.info "Loading #{spec.name} #{spec.version} from yardoc"
       result = Mapper.new(YARD::Registry.all, spec).map
       if spec
         ser = File.join(CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}.ser")
@@ -435,5 +437,3 @@ module Solargraph
 end
 
 Solargraph::YardMap::CoreDocs.require_minimum
-# Change YARD log IO to avoid sending unexpected messages to STDOUT
-YARD::Logger.instance.io = File.new(File::NULL, 'w')

data/lib/yard-solargraph.rb

@@ -2,6 +2,9 @@
 
 require 'yard'
 
+# Change YARD log IO to avoid sending unexpected messages to STDOUT
+YARD::Logger.instance.io = File.new(File::NULL, 'w')
+
 module Solargraph
   # A placeholder for the @!domain directive. It doesn't need to do anything
   # for yardocs. It's only used for Solargraph API maps.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.42.3
+  version: 0.42.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport