ruby-lsp-ree 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be41c6719d100fed8169e29ecfb808cf73611625cd14982727ee7763ab55d809
-  data.tar.gz: 2dac21136c9605aadeb19544f3efb6d9cf3044b40cfeaca2279203ba846f101d
+  metadata.gz: 3af40015524718e3433f1a2b95917baa2b54c15c864e86a7da3bf6118e7071e9
+  data.tar.gz: e5147f8b8e9bdd46b581ab242bce841f2aea4399d2316049969971e661fe8dd9
 SHA512:
-  metadata.gz: 03f9fd7161d065c127b7f479b547b92edad8923b9a24eaa12b687382ad50b1946fa37029281bdda7aa9b9159ddc19f281f304479ec9c35e8516701eaf13b4e6b
-  data.tar.gz: d2324472049d592331c2ad8a32e156fa374f85f644ab67ce366cecdd486260804c0830aa6372c040669ca291584cd39368860b8ebc29f1c4013bb927a20e5a12
+  metadata.gz: 6203eec4bde801799acc516f4a2b1f3f70d785e67b2002075244f17f33e52bd65a27bbd2193da1e590cc2dd7cfc885d2dd39d1e55a4f5b5eafe6e5694bf23b7a
+  data.tar.gz: bbad6e6ed3c0ce9a07f7e6717f5bdd9271b422861e7066a092030d66ca44e331223594d5aed4746274abf20b1c22c77dca03b0a38b9cd45dddf0d58d48545dd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-lsp-ree (0.1.22)
+    ruby-lsp-ree (0.1.23)
 
 GEM
   remote: https://rubygems.org/

data/lib/ruby_lsp/ruby_lsp_ree/parsing/body_parsers/body_objects_parser.rb

@@ -32,12 +32,14 @@ class RubyLsp::Ree::BodyObjectsParser
     @target_type = target_type
   end
 
-  def parse(node_body)
+  def parse(nodes)
     target_objects = []
 
-    return target_objects unless node_body
-    
-    node_body.each do |node|
+    return target_objects unless nodes
+
+    nodes.each do |node|
+      next if node.is_a?(Prism::DefNode) # for now don't step into method, parse each method separately
+      
       if node.is_a?(Prism::ConstantReadNode) && @target_type == :const_object
         target_objects << ConstObject.new(name: node.name)
       end
@@ -46,6 +48,8 @@ class RubyLsp::Ree::BodyObjectsParser
         if node.receiver
           target_objects += parse([node.receiver])
         else
+          next if node.name == :link # don't parse objects inside links
+
           if @target_type == :call_object
             target_objects << CallObject.new(name: node.name, type: :method_call)
           end
@@ -62,7 +66,7 @@ class RubyLsp::Ree::BodyObjectsParser
         end
         
         if node.respond_to?(:statements)
-          target_objects += parse(node.statements.body)
+          target_objects += parse([node.statements])
         end
 
         if node.respond_to?(:subsequent)
@@ -88,10 +92,34 @@ class RubyLsp::Ree::BodyObjectsParser
         if node.respond_to?(:parts) && node.parts
           target_objects += parse(node.parts)
         end
+
+        if node.respond_to?(:rescue_clause) && node.rescue_clause
+          target_objects += parse([node.rescue_clause])
+        end
+
+        if node.respond_to?(:else_clause) && node.else_clause
+          target_objects += parse([node.else_clause])
+        end
+
+        if node.respond_to?(:ensure_clause) && node.ensure_clause
+          target_objects += parse([node.ensure_clause])
+        end
+
+        if node.respond_to?(:body) && node.body
+          if node.body.is_a?(Array)
+            target_objects += parse(node.body)
+          else
+            target_objects += parse([node.body])
+          end
+        end
       end
 
       if node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)
-        target_objects += parse(get_method_body(node.block))
+        if node.block.body.is_a?(Array)
+          target_objects += parse(node.block.body)
+        else
+          target_objects += parse([node.block.body])
+        end
       end
     end
 

data/lib/ruby_lsp/ruby_lsp_ree/parsing/body_parsers/call_objects_parser.rb

@@ -23,10 +23,10 @@ class RubyLsp::Ree::CallObjectsParser
   end
 
   def method_call_objects(method_object)
-    method_body = method_object.method_body
+    method_body = method_object.full_method_body
     return [] unless method_body
 
-    call_objects = @body_parser.parse(method_body)
+    call_objects = @body_parser.parse([method_body])
 
     call_objects.each{ |call_object| call_object.set_method_name(method_object.name) }
     call_objects

data/lib/ruby_lsp/ruby_lsp_ree/parsing/body_parsers/const_objects_parser.rb

@@ -23,10 +23,10 @@ class RubyLsp::Ree::ConstObjectsParser
   end
 
   def method_const_objects(method_object)
-    method_body = method_object.method_body
+    method_body = method_object.full_method_body
     return [] unless method_body
 
-    const_objects = @body_parser.parse(method_body)
+    const_objects = @body_parser.parse([method_body])
 
     if method_object.has_contract?
       const_objects += @body_parser.parse([method_object.contract_node])

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_method_node.rb

@@ -38,6 +38,10 @@ class RubyLsp::Ree::ParsedMethodNode
     get_method_body(@method_node)
   end
 
+  def full_method_body
+    @method_node.body
+  end
+
   def raised_errors_nested
     return @raised_errors_nested if @raised_errors_nested
     raised = raised_errors

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.22"
+    VERSION = "0.1.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Ruslan Gatiyatov