solargraph 0.40.0 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 114793e89d26f6afb191184519f707ddad0563f5815a52f85cd7728dc10c6a0c
-  data.tar.gz: 7e6a553bfeba840d1595a296d272cac316e5db6c382afeaf02802d86f3110e00
+  metadata.gz: e02cce6c25457bb0284d221d1a9bef97730b7d7be18129cdee0dcfa1aae9c02b
+  data.tar.gz: 5143879ae0f89fd7ca608646cfe96fccc1e6c15afd7940fc7948dff358f286f3
 SHA512:
-  metadata.gz: b3d198065d425b885851210c894e5934cce862ad57464fea9f56271f52404d0770957e0b5f40bc9b98058e7255de24454b28f07f9dee73da459ebe236a3c70d4
-  data.tar.gz: 5071313301cfa44cd4983fd437b9a4f5ba5d6ac70ee393b4539c47261ab0830ed342925010db9edf91898165026d1c1cc70814c2f63a3be86f91c04224e2ec29
+  metadata.gz: 7c868fd6c6bb344f532eeee02ef06f9b80df086b51a49e408f5c04961303524f36d6b27cfae37b200a92bf0b65e15a3e68be029aad66bf912dd1aa73b1f48714
+  data.tar.gz: 6a9cbcd839ab51d1c71d83a30a73464f337faffda715059e91de57a3519783793574901f23d738c83a49d1116d41268c4992fa304c08d8892e394e12bb5011c8

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - jruby-head
 matrix:
   include:
@@ -15,7 +16,7 @@ matrix:
       os: osx
   allow_failures:
     - rvm: jruby-head
-      
+    - rvm: 3.0
 before_install:
 - gem update --system
 - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.40.1 - December 28, 2020
+- Use temp directory for RuboCop formatting (#397)
+- NodeMethods reads splatted hashes (#396)
+
 ## 0.40.0 - December 14, 2020
 - Fix alias behavior
 - Consolidate method pin classes

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

@@ -2,6 +2,7 @@
 
 require 'rubocop'
 require 'securerandom'
+require 'tmpdir'
 
 module Solargraph
   module LanguageServer
@@ -12,25 +13,22 @@ module Solargraph
 
           def process
             filename = uri_to_file(params['textDocument']['uri'])
-            # Make the temp file in the original file's directory so RuboCop
-            # 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
-              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)
-              format original, result
-            rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
-              set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
-            ensure
-              File.unlink tempfile
+            Dir.mktmpdir do |tempdir|
+              tempfile = File.join(tempdir, File.basename(filename))
+              rubocop_file = Diagnostics::RubocopHelpers.find_rubocop_file(filename)
+              original = host.read_text(params['textDocument']['uri'])
+              File.write tempfile, original
+              begin
+                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)
+                format original, result
+              rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
+                set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
+              end
             end
           end
 

data/lib/solargraph/library.rb

@@ -209,7 +209,6 @@ module Solargraph
     # @return [Array<Solargraph::Range>]
     # @todo Take a Location instead of filename/line/column
     def references_from filename, line, column, strip: false
-      # checkout filename
       cursor = api_map.cursor_at(filename, Position.new(line, column))
       clip = api_map.clip(cursor)
       pins = clip.define
@@ -222,7 +221,7 @@ module Solargraph
             referenced = definitions_at(loc.filename, loc.range.ending.line, loc.range.ending.character)
             # HACK: The additional location comparison is necessary because
             # Clip#define can return proxies for parameter pins
-            referenced.any?{|r| r == pin || r.location == pin.location}
+            referenced.any? { |r| r == pin || r.location == pin.location }
           end
           # HACK: for language clients that exclude special characters from the start of variable names
           if strip && match = cursor.word.match(/^[^a-z0-9_]+/i)
@@ -290,7 +289,6 @@ module Solargraph
     # @param filename [String]
     # @return [Array<Solargraph::Pin::Base>]
     def document_symbols filename
-      # checkout filename
       api_map.document_symbols(filename)
     end
 

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

@@ -98,6 +98,7 @@ module Solargraph
 
         def convert_hash node
           return {} unless Parser.is_ast_node?(node) && node.type == :hash
+          return convert_hash(node.children[0].children[0]) if splatted_hash?(node)
           result = {}
           node.children.each do |pair|
             result[pair.children[0].children[0]] = Solargraph::Parser.chain(pair.children[1])
@@ -118,6 +119,10 @@ module Solargraph
           result
         end
 
+        def splatted_hash? node
+          Parser.is_ast_node?(node.children[0]) && node.children[0].type == :kwsplat
+        end
+
         # @todo Temporarily here for testing. Move to Solargraph::Parser.
         def call_nodes_from node
           return [] unless node.is_a?(::Parser::AST::Node)

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

@@ -90,7 +90,9 @@ module Solargraph
         end
 
         def convert_hash node
-          return {} unless node?(node) && node.type == :HASH && node?(node.children[0])
+          return {} unless node?(node) && node.type == :HASH
+          return convert_hash(node.children[0].children[1]) if splatted_hash?(node)
+          return {} unless node?(node.children[0])
           result = {}
           index = 0
           until index > node.children[0].children.length - 2
@@ -103,6 +105,14 @@ module Solargraph
           result
         end
 
+        def splatted_hash? node
+          node?(node.children[0]) &&
+            [:ARRAY, :LIST].include?(node.children[0].type) &&
+            node.children[0].children[0].nil? &&
+            node?(node.children[0].children[1]) &&
+            node.children[0].children[1].type == :HASH
+        end
+
         def node? node
           node.is_a?(RubyVM::AbstractSyntaxTree::Node)
         end

data/lib/solargraph/version.rb

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

metadata

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