solargraph 0.39.5 → 0.39.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d82e12b3dbc74f908e6fd15757e8856c7c3af088ccbfbc6724f390884f878d
-  data.tar.gz: df04fa34d85b0633d05ab8fd216873264a4cdaa148089ffa3af909ec68a227a7
+  metadata.gz: 4a81ce77f7d8227f2e1bf419edb00bbb35c104f9432f3bf9fca55453f70d118b
+  data.tar.gz: 3a3fa7eab3220e6933d4aa79d882caf25f2ec2a21e267b062237d4f3f1437ca2
 SHA512:
-  metadata.gz: d1972e824e94ad830815eb780629ef985a5be4b21247f426b603e209cecc60d6c5c02219c63cdc2c6c9ab184013d72e1798c29ef90b5a91d77a92f8dd35e1295
-  data.tar.gz: 7f5564c3de416999a40e381d853746e759898da6fa09eb6d967735478a24635f1af3cee6695894b7213c8b6746e73d8e3d57d3adc141ab505040e0eb4c8134cd
+  metadata.gz: 12fac0ebf0358c1949dde571705a5969049ff72b27d2d2385f72d1272f813ebf133a4aebb5f567462b7d31f105e4960e33fe11f87b2987b00a0a3858e7d533c7
+  data.tar.gz: f2562a24884685db6290dfd7c13894949dab71989466dc60ade3a3c2694c90c27ad1d110cc0001e0b03adb1aaabc4ab7ef34d3b8b6fb0ffe5fd8b268c7b70d36

data/lib/solargraph/language_server/host.rb

@@ -99,7 +99,7 @@ module Solargraph
           message = Message.select(request['method']).new(self, request)
           begin
             message.process
-          rescue Exception => e
+          rescue StandardError => e
             logger.warn "Error processing request: [#{e.class}] #{e.message}"
             logger.warn e.backtrace.join("\n")
             message.set_error Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}"

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

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: require_keyword?(node) ? :kwarg : :kwoptarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| [:kwrestarg, :blockarg].include?(par.decl) }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
 

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

@@ -16,7 +16,12 @@ module Solargraph
               presence: region.closure.location.range,
               decl: :optarg
             )
-            region.closure.parameters.push locals.last
+            idx = region.closure.parameters.find_index { |par| par.decl != :arg }
+            if idx
+              region.closure.parameters.insert idx, locals.last
+            else
+              region.closure.parameters.push locals.last
+            end
             node.children[1] && NodeProcessor.process(node.children[1], region, pins, locals)
           end
         end

data/lib/solargraph/pin/parameter.rb

@@ -41,7 +41,7 @@ module Solargraph
           "*#{name}"
         when :kwrestarg
           "**#{name}"
-        when :block
+        when :block, :blockarg
           "&#{name}"
         else
           name

data/lib/solargraph/shell.rb

@@ -175,7 +175,7 @@ module Solargraph
             puts pin_description(pin) if options[:verbose]
             pin.typify api_map
             pin.probe api_map
-          rescue Exception => e
+          rescue StandardError => e
             STDERR.puts "Error testing #{pin_description(pin)} #{pin.location ? "at #{pin.location.filename}:#{pin.location.range.start.line + 1}" : ''}"
             STDERR.puts "[#{e.class}]: #{e.message}"
             STDERR.puts e.backtrace.join("\n")

data/lib/solargraph/source_map/mapper.rb

@@ -82,6 +82,8 @@ module Solargraph
       # @param comment [String]
       # @return [Integer]
       def find_directive_line_number comment, tag, start
+        # Avoid overruning the index
+        return start unless start < comment.lines.length
         num = comment.lines[start..-1].find_index do |line|
           # Legacy method directives might be `@method` instead of `@!method`
           # @todo Legacy syntax should probably emit a warning

data/lib/solargraph/version.rb

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

data/lib/solargraph/workspace.rb

@@ -170,7 +170,7 @@ module Solargraph
         Dir.chdir base do
           begin
             # @type [Gem::Specification]
-            spec = eval(File.read(file), nil, file)
+            spec = eval(File.read(file), TOPLEVEL_BINDING, file)
             next unless Gem::Specification === spec
             @gemnames.push spec.name
             result.concat(spec.require_paths.map { |path| File.join(base, path) })

data/lib/solargraph/yard_map.rb

@@ -102,7 +102,7 @@ module Solargraph
       else
         YARD::Registry.load! y
       end
-    rescue Exception => e
+    rescue StandardError => e
       Solargraph::Logging.logger.warn "Error loading yardoc '#{y}' #{e.class} #{e.message}"
       yardocs.delete y
       nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.39.5
+  version: 0.39.6
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport