ruby-lsp-ree 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1b2bf9c373c729b6412704fd6daf364ed4c8b278405f52b4c1fc32b256570c
-  data.tar.gz: 0bde5c4413ec6d4ccfd807dc6e6eb33d1e47ab018dfbfaad47200775b2c3badb
+  metadata.gz: 385dfd53ada066f3fbbe41421c4b425773d26e70fd129a68a43d623c77840597
+  data.tar.gz: 1f9d2120db749bb2bf71a56653143d847dad3463fcc1a7528b790be2ea5e667e
 SHA512:
-  metadata.gz: 6a97047d4924f208415ba6c5ed45e6abb57141e74fd44ad79368a9a7dd025a2ce0c36cfe2ca95db6fd0dab9586d9a1c5484be2e930ab129ab6acb7975fce310f
-  data.tar.gz: 17daba371512607775021704c56895bcc9e41666e598c9603c7da22ebac567de1cc7a2957f050a6657429057557dcbbc86654141eba98faa8c7ddde6e892a030
+  metadata.gz: 110bcd5a8efdc990f09b8c62c0448799e4573187d630da481390594f5544137c7445971bb3936aed2c1bc76c638843d8084fcbe0c3dac2fe4fb26fe04f08ce6e
+  data.tar.gz: c2f53768271f71890342e40dfd7762102b7b63323f4c68386a3503847ecd15635ad2adfe338f030ec410f1d46d944206faaa20f5c158d9c769a4031a40fe1f2a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.1.17] - 2025-04-28
+
+- add missing imports: improved handling imports with the same name
+- add missing imports: handle more cases with missing imports (nested calls, predicates, etc.)
+
 ## [0.1.16] - 2025-04-24
 
 - formatter: add missing imports

data/Gemfile.lock

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

data/lib/ruby_lsp/ruby_lsp_ree/formatters/missing_imports_formatter.rb

@@ -17,16 +17,12 @@ module RubyLsp
 
         current_package = package_name_from_uri(uri)
 
-        fn_calls = parsed_doc.parse_fn_calls
-        filtered_fn_calls = filter_fn_calls(parsed_doc, fn_calls)
-        objects_to_add = filtered_fn_calls.map{ |fn_call|
-          finder.find_object(fn_call.name.to_s)
-        }.compact
 
-        bean_calls = parsed_doc.parse_bean_calls
-        filtered_bean_calls = filter_bean_calls(parsed_doc, bean_calls)
-        objects_to_add += filtered_bean_calls.map{ |bean_call|
-          finder.find_object(bean_call.receiver_name.to_s)
+        method_calls = parsed_doc.parse_method_calls
+        filtered_method_calls = filter_method_calls(parsed_doc, method_calls)
+        objects_to_add = filtered_method_calls.map{ |fn_call|
+          ree_objects = finder.find_objects(fn_call.name.to_s)
+          choose_object_to_add(ree_objects, current_package)
         }.compact
 
         objects_to_add.uniq!{ |obj| obj.name }
@@ -39,25 +35,40 @@ module RubyLsp
 
       private
 
-      def filter_fn_calls(parsed_doc, fn_calls)
+      def filter_method_calls(parsed_doc, method_calls)
         parsed_doc.parse_instance_methods
 
-        fn_calls.reject{ |fn_call| 
-          parsed_doc.doc_instance_methods.map(&:name).include?(fn_call.name) 
-        }
-      end
-
-      def filter_bean_calls(parsed_doc, bean_calls)
-        bean_calls.select do |bean_call|
-          if !bean_call.method_name
+        method_calls.select do |method_call|
+          if !method_call.method_name
             true
+          elsif parsed_doc.doc_instance_methods.map(&:name).include?(method_call.name) 
+            false
           else
-            method_obj = parsed_doc.doc_instance_methods.detect{ _1.name == bean_call.method_name }
-            local_variables = method_obj.parse_local_variables
-            !local_variables.map(&:name).include?(bean_call.receiver_name)
+            method_obj = parsed_doc.doc_instance_methods.detect{ _1.name == method_call.method_name }
+            local_variables = method_obj.parse_local_variables.map(&:name)
+            method_params = method_obj.param_names
+
+            !local_variables.include?(method_call.name) && !method_params.include?(method_call.name)
           end
         end
       end
+
+      def choose_object_to_add(ree_objects, current_package)
+        return if !ree_objects || ree_objects.size == 0
+        return ree_objects.first if ree_objects.size == 1
+
+        current_package_object = ree_objects.detect{ _1.object_package == current_package }
+        return current_package_object if current_package_object
+
+        package_names = ree_objects.map(&:object_package)
+        if package_names.sort == ['ree_date', 'ree_datetime'].sort
+          return ree_objects.detect{ _1.object_package == 'ree_datetime' }
+        end
+
+        ree_object = ree_objects.first
+        ree_object.set_package!('FILL_PACKAGE')
+        ree_object
+      end
     end
   end
 end

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

@@ -52,24 +52,51 @@ class RubyLsp::Ree::CallObjectsParser
 
   def parse_body_call_objects(node_body)
     call_objects = []
-    
+
     node_body.each do |node|
       if node.is_a?(Prism::CallNode)
-        receiver = get_first_receiver(node)
-        receiver_name = receiver.respond_to?(:name) ? receiver.name : nil
-        call_objects << CallObject.new(name: node.name, type: :method_call, receiver_name: receiver_name)
-      elsif node.respond_to?(:statements)
-        call_objects += parse_body_call_objects(node.statements.body)
-      elsif node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)
-        call_objects += parse_body_call_objects(get_method_body(node.block))
-      elsif node.respond_to?(:value) && node.value
-        call_objects += parse_body_call_objects([node.value])
+        if node.receiver
+          receiver = get_first_receiver(node)
+      
+          if receiver.is_a?(Prism::CallNode)
+            call_objects += parse_body_call_objects([receiver])
+          end
+        else
+          call_objects << CallObject.new(name: node.name, type: :method_call)
+        end
+      
+        call_objects += parse_call_objects_from_args(node.arguments)
+      else
+        if node.respond_to?(:elements)
+          call_objects += parse_body_call_objects(node.elements)
+        end
+
+        if node.respond_to?(:predicate)
+          call_objects += parse_body_call_objects([node.predicate])
+        end
+        
+        if node.respond_to?(:statements)
+          call_objects += parse_body_call_objects(node.statements.body)
+        end
+        
+        if node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)
+          call_objects += parse_body_call_objects(get_method_body(node.block))
+        end
+
+        if node.respond_to?(:value) && node.value
+          call_objects += parse_body_call_objects([node.value])
+        end
       end
     end
 
     call_objects
   end
 
+  def parse_call_objects_from_args(node_arguments)
+    return [] if !node_arguments || !node_arguments.arguments
+    parse_body_call_objects(node_arguments.arguments)
+  end
+
   def parse_body_call_expressions(node_body)
     call_expressions = []
     

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

@@ -205,12 +205,8 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
       .map(&:name)
   end
 
-  def parse_fn_calls
-    RubyLsp::Ree::CallObjectsParser.new(self).class_call_objects.select{ !_1.receiver_name }
-  end
-
-  def parse_bean_calls
-    RubyLsp::Ree::CallObjectsParser.new(self).class_call_objects.select{ _1.receiver_name }
+  def parse_method_calls
+    RubyLsp::Ree::CallObjectsParser.new(self).class_call_objects
   end
 
   def class_name

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

@@ -13,6 +13,13 @@ class RubyLsp::Ree::ParsedMethodNode
     @method_node.name
   end
 
+  def param_names
+    @method_node.parameters.requireds.map(&:name) + 
+    @method_node.parameters.keywords.map(&:name) + 
+    [@method_node.parameters.rest&.name] + 
+    [@method_node.parameters.keyword_rest&.name]
+  end
+
   def has_contract?
     !!@contract_node
   end

data/lib/ruby_lsp/ruby_lsp_ree/ree_object_finder.rb

@@ -1,3 +1,4 @@
+require 'delegate'
 require_relative "utils/ree_lsp_utils"
 
 module RubyLsp
@@ -9,6 +10,20 @@ module RubyLsp
 
       REE_OBJECT_STRING = 'ree_object'
 
+      class ReeObjectDecorator < SimpleDelegator
+        include RubyLsp::Ree::ReeLspUtils
+
+        def object_package
+          return @package_name if @package_name
+
+          package_name_from_uri(uri)
+        end
+
+        def set_package!(package_name)
+          @package_name = package_name
+        end
+      end
+
       def initialize(index)
         @index = index
       end
@@ -41,6 +56,14 @@ module RubyLsp
         objects_by_name.detect{ _1.comments.to_s.lines.first&.chomp == REE_OBJECT_STRING }
       end
 
+      def find_objects(name)
+        objects_by_name = @index[name]
+        return unless objects_by_name
+
+        ree_objects = objects_by_name.select{ _1.comments.to_s.lines.first&.chomp == REE_OBJECT_STRING }
+        decorate_objects(ree_objects)
+      end
+
       def find_object_for_package(name, package_name)
         objects_by_name = @index[name]
         return unless objects_by_name
@@ -65,6 +88,12 @@ module RubyLsp
       def object_documentation(ree_object)
         ree_object.comments.lines[2..-1].join("\n").chomp
       end
+
+      private 
+      
+      def decorate_objects(ree_objects)
+        ree_objects.map{ ReeObjectDecorator.new(_1) }
+      end
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_ree/ree_source_editor.rb

@@ -68,12 +68,11 @@ module RubyLsp
         new_text = ''
 
         ree_objects.each do |ree_object|
-          object_package = package_name_from_uri(ree_object.uri)
-
-          link_text = if current_package == object_package
+          link_text = if current_package == ree_object.object_package
             "\s\slink :#{ree_object.name}"
           else
-            "\s\slink :#{ree_object.name}, from: :#{object_package}"
+            package_str = ree_object.object_package == 'FILL_PACKAGE' ? 'FILL_PACKAGE' : ":#{ree_object.object_package}"
+            "\s\slink :#{ree_object.name}, from: #{package_str}"
           end
 
           if parsed_doc.links_container_node

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.16"
+    VERSION = "0.1.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email: