solargraph 0.35.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a0b8dd485332480c292f17a1cae69217cf9cb4e5f3aa9c29bd94ac55d57ab8
-  data.tar.gz: f74891d9e13561d6a1ece0fb64fd014af2b1504e412e9d51b4e83d8d6a9aa089
+  metadata.gz: e6e65af0d45e5656d2bc17c0670ef5e308e3fb6f64be8db0ec1891e2203a81d6
+  data.tar.gz: 47e21df5e48d43ed40281d37ae3c50ddf6aaf643dff49da07b849d917f3fcf16
 SHA512:
-  metadata.gz: f3c8574a741707ef88be3f6ec1e1287b4a67b091d0c12634e65d563e93510ba135c193b55f9f4d05af5a5f8b1d9a6c661f691e571811281cd523c6a62eec5513
-  data.tar.gz: 13a013bcc7738c449696207a3622e1b3d3b7bed626fd2e39fe2a89c08eb42776fd19a32c7d65642b4ada6535a94af0f3f0a6ea3aee303eba1c2407daff9d4ad9
+  metadata.gz: 39b7b5fb39ce59ccf93c62775e3f685f0e71409aa791f76bf61a44202cb21d1501452961d267f07b40fb4dbbba8a82a2ebc349cea6857dc9e3b9796af9c8e510
+  data.tar.gz: 584f2110a4faf9cd98edd37bed4167b59f119b66168786d1faa0ad774d3180d66a0408e195d4a669f62cbd9252db75d0aa442fc6e4640f403eccd227b6320062

data/lib/solargraph/pin/base_variable.rb

@@ -45,7 +45,10 @@ module Solargraph
         returns_from(@assignment).each do |node|
           pos = Solargraph::Position.new(node.loc.expression.last_line, node.loc.expression.last_column)
           clip = api_map.clip_at(location.filename, pos)
-          result = clip.infer
+          # Use the return node for inference. The clip might infer from the
+          # first node in a method call instead of the entire call.
+          chain = Solargraph::Source::NodeChainer.chain(node, nil, clip.in_block?)
+          result = chain.infer(api_map, closure, clip.locals)
           types.push result unless result.undefined?
         end
         return ComplexType::UNDEFINED if types.empty?

data/lib/solargraph/source_map/clip.rb

@@ -95,6 +95,14 @@ module Solargraph
         block.gates
       end
 
+      def in_block?
+        return @in_block unless @in_block.nil?
+        @in_block = begin
+          tree = cursor.source.tree_at(cursor.position.line, cursor.position.column)
+          tree[1].is_a?(Parser::AST::Node) && tree[1].type == :block
+        end
+      end
+
       private
 
       # @return [ApiMap]

data/lib/solargraph/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.35.1
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport