ruby-lsp-ree 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385dfd53ada066f3fbbe41421c4b425773d26e70fd129a68a43d623c77840597
-  data.tar.gz: 1f9d2120db749bb2bf71a56653143d847dad3463fcc1a7528b790be2ea5e667e
+  metadata.gz: 9061105dc55ff366d35880fe7960838159e9635115e26b352197837cf30c70c7
+  data.tar.gz: 147936b7c46a0f5ac07442195079fdee2ae98ca6b88df0a800e48ab3d2c62f77
 SHA512:
-  metadata.gz: 110bcd5a8efdc990f09b8c62c0448799e4573187d630da481390594f5544137c7445971bb3936aed2c1bc76c638843d8084fcbe0c3dac2fe4fb26fe04f08ce6e
-  data.tar.gz: c2f53768271f71890342e40dfd7762102b7b63323f4c68386a3503847ecd15635ad2adfe338f030ec410f1d46d944206faaa20f5c158d9c769a4031a40fe1f2a
+  metadata.gz: 344f57eaefab54e046008b80b81f6d131eb9128e5b88230543f09ebc8d93af0b979310b370c0f951fd1667a895ab9d5dff5a5d85a96e34b005bebb04d02ee992
+  data.tar.gz: 0ea492e66ed6beeb7deef48e3f89f8c54295645afeece6e290c43b41979a28980aa470e840ef1fc9e77c4e04f176cd29f1e75b6c32638d994615344e83831868

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-lsp-ree (0.1.17)
+    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,7 +17,6 @@ module RubyLsp
 
         current_package = package_name_from_uri(uri)
 
-
         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|

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

@@ -86,6 +86,14 @@ class RubyLsp::Ree::CallObjectsParser
         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
 

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

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/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

@@ -58,7 +58,7 @@ module RubyLsp
 
       def find_objects(name)
         objects_by_name = @index[name]
-        return unless objects_by_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)

data/lib/ruby_lsp/ruby_lsp_ree/ree_source_editor.rb

@@ -92,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.17"
+    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.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-04-28 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