ruby-lsp-ree 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1b2bf9c373c729b6412704fd6daf364ed4c8b278405f52b4c1fc32b256570c
-  data.tar.gz: 0bde5c4413ec6d4ccfd807dc6e6eb33d1e47ab018dfbfaad47200775b2c3badb
+  metadata.gz: 9061105dc55ff366d35880fe7960838159e9635115e26b352197837cf30c70c7
+  data.tar.gz: 147936b7c46a0f5ac07442195079fdee2ae98ca6b88df0a800e48ab3d2c62f77
 SHA512:
-  metadata.gz: 6a97047d4924f208415ba6c5ed45e6abb57141e74fd44ad79368a9a7dd025a2ce0c36cfe2ca95db6fd0dab9586d9a1c5484be2e930ab129ab6acb7975fce310f
-  data.tar.gz: 17daba371512607775021704c56895bcc9e41666e598c9603c7da22ebac567de1cc7a2957f050a6657429057557dcbbc86654141eba98faa8c7ddde6e892a030
+  metadata.gz: 344f57eaefab54e046008b80b81f6d131eb9128e5b88230543f09ebc8d93af0b979310b370c0f951fd1667a895ab9d5dff5a5d85a96e34b005bebb04d02ee992
+  data.tar.gz: 0ea492e66ed6beeb7deef48e3f89f8c54295645afeece6e290c43b41979a28980aa470e840ef1fc9e77c4e04f176cd29f1e75b6c32638d994615344e83831868

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.1.18] - 2025-05-05
+
+- formatter: do not remove links from mappers
+- formatter: change incorrect package for link on save
+- add missing imports: add more cases with missing imports
+
+## [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.18)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -32,7 +32,7 @@ To switch off/on formatter features, use Ruby LSP addon settings:
     }
   }
 ```
-available formatters: `SortLinksFormatter`, `MissingErrorDefinitionsFormatter`, `MissingErrorContractsFormatter`, `MissingErrorLocalesFormatter`, `UnusedLinksFormatter`, `MissingImportsFormatter`
+available formatters: `SortLinksFormatter`, `MissingErrorDefinitionsFormatter`, `MissingErrorContractsFormatter`, `MissingErrorLocalesFormatter`, `UnusedLinksFormatter`, `MissingImportsFormatter`, `ImportPackagesFormatter`
 
 ## Functions
 
@@ -43,4 +43,5 @@ available formatters: `SortLinksFormatter`, `MissingErrorDefinitionsFormatter`,
 - missing error locales detection
 - Go To Definition for Ree objects
 - hover information for Ree objects and error locales
-- Ree templates support
+- Ree templates support
+- add missing import links on save

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

@@ -0,0 +1,42 @@
+require_relative 'base_formatter'
+require_relative "../ree_object_finder"
+
+module RubyLsp
+  module Ree
+    class ImportPackagesFormatter < BaseFormatter
+      include RubyLsp::Ree::ReeLspUtils
+
+      def call(source, uri)
+        return source unless @index
+
+        parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(source, uri)
+
+        finder = ReeObjectFinder.new(@index)
+        editor = RubyLsp::Ree::ReeSourceEditor.new(source)
+
+        current_package = package_name_from_uri(uri)
+
+        parsed_doc.link_nodes.select(&:object_name_type?).each do |link_node|
+          next if finder.find_object_for_package(link_node.name, link_node.link_package_name)
+            
+          ree_objects = finder.find_objects(link_node.name)
+          
+          if ree_objects.size == 1
+            editor.change_link_package(link_node, ree_objects.first.object_package, current_package)
+          else
+            send_message(link_node.name)
+          end
+        end
+
+        editor.source
+      end
+
+      private
+
+      def send_message(link_name)   
+        message = "Link package is invalid for: #{link_name}"
+        @message_queue << RubyLsp::Notification.window_show_message(message, type: Constant::MessageType::ERROR)
+      end
+    end
+  end
+end

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

@@ -17,16 +17,11 @@ 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 +34,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/formatters/unused_links_formatter.rb

@@ -34,7 +34,7 @@ module RubyLsp
             end
           end
 
-          next if link_is_used?(link_node, remove_imports)
+          next if link_is_used?(link_node, remove_imports) || parsed_doc.includes_mapper_dsl?
 
           editor.remove_link(link_node)
           removed_links += 1

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

@@ -52,24 +52,59 @@ 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
+
+        if node.respond_to?(:left) && node.left
+          call_objects += parse_body_call_objects([node.left])
+        end
+
+        if node.respond_to?(:right) && node.right
+          call_objects += parse_body_call_objects([node.right])
+        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_base_document.rb

@@ -28,6 +28,10 @@ class RubyLsp::Ree::ParsedBaseDocument
     false
   end
 
+  def includes_mapper_dsl?
+    false
+  end
+
   def includes_linked_object?(obj_name)
     @link_nodes.map(&:name).include?(obj_name)
   end
@@ -36,6 +40,12 @@ class RubyLsp::Ree::ParsedBaseDocument
     @link_nodes.detect{ node_name(_1) == name }
   end
 
+  def find_import_for_package(name, package_name)
+    @link_nodes.detect do |link_node|
+      link_node.imports.include?(name) && link_node.link_package_name == package_name
+    end
+  end
+
   def node_name(node)
     return nil unless node.respond_to?(:name)
 

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

@@ -40,6 +40,10 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
     @class_includes.any?{ node_name(_1) == ROUTES_DSL_MODULE }
   end
 
+  def includes_mapper_dsl?
+    @class_includes.any?{ node_name(_1) == MAPPER_DSL_MODULE }
+  end
+
   def includes_ree_dsl?
     ree_dsls.size > 0
   end
@@ -54,12 +58,6 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
     end
   end
 
-  def find_import_for_package(name, package_name)
-    @link_nodes.detect do |link_node|
-      link_node.imports.include?(name) && link_node.link_package_name == package_name
-    end
-  end
-
   def has_blank_links_container?
     links_container_node && !@links_container_block_node
   end
@@ -77,9 +75,11 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
   end
 
   def parse_class_includes
-    return unless has_body?
+    return @class_includes if @class_includes
+    @class_includes = []
+    return @class_includes unless has_body?
 
-    @class_includes ||= class_node.body.body.select{ node_name(_1) == :include }.map do |class_include|
+    @class_includes = class_node.body.body.select{ node_name(_1) == :include }.map do |class_include|
       first_arg = class_include.arguments.arguments.first
 
       include_name = case first_arg
@@ -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_link_node.rb

@@ -1,7 +1,7 @@
 require 'prism'
 
 class RubyLsp::Ree::ParsedLinkNode
-  attr_reader :node, :document_package, :name, :import_items
+  attr_reader :node, :document_package, :name, :import_items, :from_param
 
   FROM_ARG_KEY = 'from'
   IMPORT_ARG_KEY = 'import'
@@ -27,6 +27,8 @@ class RubyLsp::Ree::ParsedLinkNode
     @node = node
     @document_package = document_package
     @name = parse_name
+
+    parse_params
   end
 
   def link_package_name
@@ -43,13 +45,9 @@ class RubyLsp::Ree::ParsedLinkNode
   end
 
   def from_arg_value
-    @kw_args ||= @node.arguments.arguments.detect{ |arg| arg.is_a?(Prism::KeywordHashNode) }
-    return unless @kw_args
-
-    @from_param ||= @kw_args.elements.detect{ _1.key.unescaped == FROM_ARG_KEY }
     return unless @from_param
 
-    @from_param.value.unescaped
+    @from_param.value.respond_to?(:unescaped) ? @from_param.value.unescaped : nil
   end
 
   def name_arg_node
@@ -125,6 +123,14 @@ class RubyLsp::Ree::ParsedLinkNode
 
   private
 
+  def parse_params
+    @kw_args = @node.arguments.arguments.detect{ |arg| arg.is_a?(Prism::KeywordHashNode) }
+    @from_param = nil
+    return unless @kw_args
+
+    @from_param = @kw_args.elements.detect{ _1.key.unescaped == FROM_ARG_KEY }
+  end
+
   def last_arg
     @node.arguments.arguments.last
   end

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_constants.rb

@@ -3,6 +3,7 @@ module RubyLsp
     module ReeConstants
       LINK_DSL_MODULE = 'Ree::LinkDSL'
       ROUTES_DSL_MODULE = 'ReeRoutes::DSL'
+      MAPPER_DSL_MODULE = 'ReeMapper::DSL'
 
       LINKS_CONTAINER_TYPES = [
         :fn,

data/lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb

@@ -4,6 +4,7 @@ require_relative 'formatters/missing_error_contracts_formatter'
 require_relative 'formatters/missing_error_locales_formatter'
 require_relative 'formatters/unused_links_formatter'
 require_relative 'formatters/missing_imports_formatter'
+require_relative 'formatters/import_packages_formatter'
 
 module RubyLsp
   module Ree
@@ -29,6 +30,7 @@ module RubyLsp
           RubyLsp::Ree::MissingErrorLocalesFormatter,
           RubyLsp::Ree::UnusedLinksFormatter,
           RubyLsp::Ree::MissingImportsFormatter,
+          RubyLsp::Ree::ImportPackagesFormatter,
           RubyLsp::Ree::SortLinksFormatter,
         ].select do |formatter|
           formatter_name = formatter.name.split('::').last.to_sym

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
@@ -93,6 +92,34 @@ module RubyLsp
 
         source_lines[line] = source_lines[line].chomp + new_text
       end
+
+      def change_link_package(link_node, new_package, current_package)
+        if new_package == current_package # change package to current -> remove 'from' param
+          return unless link_node.from_param
+
+          from_param_location = link_node.from_param.location
+          name_location = link_node.first_arg_location
+
+          line = from_param_location.start_line - 1
+          start_column = name_location.end_column - 1
+          end_column = from_param_location.end_column
+
+          source_lines[line] = source_lines[line][0..start_column] + source_lines[line][end_column..-1]
+        elsif link_node.from_param
+          from_param_location = link_node.from_param.value.location
+          line = from_param_location.start_line - 1
+          start_column = from_param_location.start_column - 1
+          end_column = from_param_location.end_column
+
+          source_lines[line] = source_lines[line][0..start_column] + ":#{new_package}" + source_lines[line][end_column..-1]
+        else
+          name_location = link_node.first_arg_location
+          line = name_location.start_line - 1
+          start_column = name_location.end_column - 1
+
+          source_lines[line] = source_lines[line][0..start_column] + ", from: :#{new_package}" + source_lines[line][start_column+1..-1]
+        end
+      end
     end
   end
 end

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.16"
+    VERSION = "0.1.18"
   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.18
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-24 00:00:00.000000000 Z
+date: 2025-05-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email:
@@ -30,6 +30,7 @@ files:
 - lib/ruby_lsp/ruby_lsp_ree/completion/const_additional_text_edits_creator.rb
 - lib/ruby_lsp/ruby_lsp_ree/completion/method_additional_text_edits_creator.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/base_formatter.rb
+- lib/ruby_lsp/ruby_lsp_ree/formatters/import_packages_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_contracts_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_definitions_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_locales_formatter.rb