solargraph 0.39.3 → 0.39.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7445b5b059ff10d5ff6b998209d3988a4d9f20b48b0b3e51b8e6b63000f18d1b
-  data.tar.gz: d17e09c8fecf38bb4bff9ca4d6985c898a2256cc6c56e4c54599b4be907e27b9
+  metadata.gz: 1a45c7684317779d321e953079f5da5532f7b7eecc852b73e609ce03dafc81dc
+  data.tar.gz: '08f96cb16887491e334fa276959cd019da3c356656a9a670c6133e491745fa55'
 SHA512:
-  metadata.gz: 61ed8f3f9f68ce49f2496e5fe07eeefbc1121350c15827bc0d600a2417e041d4f2b5d89c861c2f3b4873c20e02bd8fa708d2697b3e73d8e0ee0c858cb7c0f090
-  data.tar.gz: 6c3646376224f2237e404e4c6fcea9eaf02eaa1cfedebf9a01b6f89896d6454c03b7cbbdc16255549b528243d4c7f73a491f7d94e2d5866c6d15bc18a6db0323
+  metadata.gz: 5a9d7ec1fb35b5d870d33f16a9bf6b229b1f62a6221f7fac5d1d35e65620ac030cef5bd53c558a1ee007c37b4e187a43315abfa4cecaf146c3746e9b97a46f3f
+  data.tar.gz: 7537aa6bd14209895350f40830dd5986683982609c8e18d257eaca8993b0ab759b2e635ec6c952499a0d8559663b870c1db9b9a3c1955bd8dd096eaedde04d73

data/lib/.rubocop.yml

@@ -0,0 +1,21 @@
+Layout/EndOfLine:
+  EnforcedStyle: lf
+Style/MethodDefParentheses:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+

data/lib/solargraph/diagnostics/rubocop.rb

@@ -24,7 +24,8 @@ module Solargraph
       # @return [Array<Hash>]
       def diagnose source, _api_map
         options, paths = generate_options(source.filename, source.code)
-        runner = RuboCop::Runner.new(options, RuboCop::ConfigStore.new)
+        store = RuboCop::ConfigStore.new
+        runner = RuboCop::Runner.new(options, store)
         result = redirect_stdout{ runner.run(paths) }
         make_array JSON.parse(result)
       rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e

data/lib/solargraph/diagnostics/rubocop_helpers.rb

@@ -17,7 +17,8 @@ module Solargraph
         rubocop_file = find_rubocop_file(filename)
         args.push('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
         args.push filename
-        options, paths = RuboCop::Options.new.parse(args)
+        base_options = RuboCop::Options.new
+        options, paths = base_options.parse(args)
         options[:stdin] = code
         [options, paths]
       end
@@ -27,6 +28,8 @@ module Solargraph
       # @param filename [String]
       # @return [String, nil]
       def find_rubocop_file filename
+        return nil unless File.exist?(filename)
+        filename = File.realpath(filename)
         dir = File.dirname(filename)
         until File.dirname(dir) == dir
           here = File.join(dir, '.rubocop.yml')

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

@@ -16,11 +16,15 @@ module Solargraph
             # detects the correct configuration
             # the .rb extension is needed for ruby file without extension, else rubocop won't format
             tempfile = File.join(File.dirname(filename), "_tmp_#{SecureRandom.hex(8)}_#{File.basename(filename)}.rb")
+            rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
             original = host.read_text(params['textDocument']['uri'])
             File.write tempfile, original
             begin
-              options, paths = RuboCop::Options.new.parse(['-a', '-f', 'fi', tempfile])
-              redirect_stdout { RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths) }
+              args = ['-a', '-f', 'fi', tempfile]
+              args.unshift('-c', fix_drive_letter(rubocop_file)) unless rubocop_file.nil?
+              options, paths = RuboCop::Options.new.parse(args)
+              store = RuboCop::ConfigStore.new
+              redirect_stdout { RuboCop::Runner.new(options, store).run(paths) }
               result = File.read(tempfile)
               File.unlink tempfile
               format original, result

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

@@ -9,7 +9,7 @@ module Solargraph
 
           def process
             if [:private, :public, :protected].include?(node.children[0])
-              if (node.type == :FCALL && node.children.last.children.length > 1)
+              if node.type == :FCALL && Parser.is_ast_node?(node.children.last)
                 node.children.last.children[0..-2].each do |child|
                   # next unless child.is_a?(AST::Node) && (child.type == :sym || child.type == :str)
                   next unless child.type == :LIT || child.type == :STR

data/lib/solargraph/source.rb

@@ -338,8 +338,8 @@ 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 - 1
+      cursor += 1 while cursor < code_lines.length && code_lines[cursor].strip.empty?
+      cursor = line if cursor > code_lines.length - 1
       cursor
     end
 
@@ -468,8 +468,12 @@ module Solargraph
     # @return [Integer]
     attr_writer :version
 
+    # @param val [String]
     # @return [String]
-    attr_writer :code
+    def code=(val)
+      @code_lines= nil
+      @code = val
+    end
 
     # @return [Parser::AST::Node]
     attr_writer :node
@@ -492,6 +496,13 @@ module Solargraph
     # @return [Source::Updater]
     attr_accessor :last_updater
 
+    private
+
+    # @return [Array<String>]
+    def code_lines
+      @code_lines ||= code.lines
+    end
+
     class << self
       # @param filename [String]
       # @return [Solargraph::Source]

data/lib/solargraph/source_map/mapper.rb

@@ -185,9 +185,9 @@ module Solargraph
       # @return [void]
       def process_comment_directives
         return unless @code =~ MACRO_REGEXP
-        used = []
+        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)
+          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)
           process_comment(src_pos, com_pos, comments)
         end

data/lib/solargraph/version.rb

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

data/lib/solargraph/yard_map/rdoc_to_yard.rb

@@ -11,18 +11,23 @@ module Solargraph
       extend ApiMap::SourceToYard
 
       # @param spec [Gem::Specification]
-      def self.run spec
+      # @param cache_dir [String]
+      # @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
             pins = []
             pins.push Solargraph::Pin::ROOT_PIN
             name_hash = {}
-            cmd = "rdoc -q -N -r -o #{rdir}"
+
+            argv = ['-q', '-N', '-r', '-o', rdir]
             spec.load_paths.each do |path|
-              cmd += " -i #{path}"
+              argv.concat ['-i', path]
             end
-            `#{cmd}`
+            rdoc = RDoc::RDoc.new
+            rdoc.document argv
+
             store = RDoc::Store.new(rdir)
             store.load_all
             store.cache[:modules].each do |mod|
@@ -64,7 +69,7 @@ module Solargraph
                   closure: namepin,
                   comments: commentary(met.comment),
                   scope: met.type.to_sym,
-                  args: pin.parameters,
+                  parameters: pin.parameters,
                   visibility: met.visibility,
                   location: locate(met)
                 )
@@ -85,7 +90,7 @@ module Solargraph
             code_object_map.values.each do |co|
               YARD::Registry.register(co)
             end
-            cache_dir = File.join(Solargraph::YardMap::CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}", "yardoc")
+            cache_dir ||= File.join(Solargraph::YardMap::CoreDocs.cache_dir, 'gems', "#{spec.name}-#{spec.version}", "yardoc")
             FileUtils.remove_entry_secure cache_dir if File.exist?(cache_dir)
             FileUtils.mkdir_p cache_dir
             # @todo Should merge be true?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.3
+  version: 0.39.4
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -301,7 +301,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -310,6 +309,7 @@ files:
 - Rakefile
 - SPONSORS.md
 - bin/solargraph
+- lib/.rubocop.yml
 - lib/solargraph.rb
 - lib/solargraph/api_map.rb
 - lib/solargraph/api_map/bundler_methods.rb

data/.rubocop.yml

@@ -1,6 +0,0 @@
-Layout/EndOfLine:
-  EnforcedStyle: lf
-Style/MethodDefParentheses:
-  Enabled: false
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false