ruby-lsp-ree 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2340c5046b16e260fd66ff9696e36c4e04db071520018f683e59e4ddcaef34f
-  data.tar.gz: b3a89234d7a4627371ec1e8514970ad00ac540b5b4b6b9cdbd046a2729aa9fee
+  metadata.gz: d34821c4dab78822a47dd7fc927dbfaa8172992c8b51e62efe5650e4ed82a258
+  data.tar.gz: a2e0d86639041a0f0810da2309e3d0d1a5d95d60069d1815a01d27d1d720889a
 SHA512:
-  metadata.gz: c7e8650725c0188ec521e53188cfdd68679d5d73a392ce624b9f89c3f2daf683497e2558e932daed14cf652d25140a4bca891c3c9dbb536cfecae9cb92d72912
-  data.tar.gz: c8e71b80054434730dbc10bdb85cb82e5277f2582a00879688e25e32078e239620f0e481b0eacac4619acca9ef606933a9fd820c87bf7a075619b506b5ef0a1c
+  metadata.gz: 4c234cf9d220472e15fce43d01a5e304fb16a63de4c9b913110567f9e7f099950221308ce7b93f0637bc2d24492a4d3cafcc1da32e877fa7d0feb2a0aea2d4fa
+  data.tar.gz: 8323e4a46dcce71fd00c480374c58022415ba34603c640af812e7356bf8d0ce314fd0a8a919dc6bc54f0b23c82f2dc34c0df3f097930dc8f37bfadf56cc8a327

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.1.11] - 2025-03-28
+
+- fixed formatting errors for methods with `rescue`
+- fixed imports from enums
+- improved Add Link for constants
+
+## [0.1.10] - 2025-03-26
+
+- async_bean support
+- rename for 'copy' files
+- add diagnostics for missing locale
+- link in error locale hover leads to the correct line
+- missing locale notification
+
 ## [0.1.8] - 2025-03-21
 
 - hover: show missing locales

data/Gemfile.lock

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

data/README.md

@@ -10,15 +10,22 @@ Ree addon for Ruby LSP
 If everything was installed successfully, you should see Ree in the list of Ruby LSP addons.
 (In VS Code click `{}` brackets in the bottom right corner)
 
-To use ree_formatter, add the following line into you `settings.json` file (e.g. `.vscode/settings.json`)
+To use ree_formatter, add the following line into your `settings.json` file (e.g. `.vscode/settings.json`)
 ```json
 "rubyLsp.formatter": "ree_formatter"
 ```
 
+To use diagnostics, add the following line into your `settings.json` file (e.g. `.vscode/settings.json`)
+```json
+"rubyLsp.linters": ["ree_formatter"]
+```
+
 ## Functions
 
-- autocomplete for Ree functions
+- autocomplete for Ree objects
 - autocomplete for constants
 - adds links to the links section on autocomplete
 - sort links on document save or format (with ree_formatter enabled)
-- Go To Definition for Ree functions
+- missing error locales detection
+- Go To Definition for Ree objects
+- hover information for Ree objects and error locales

data/lib/ruby_lsp/ruby_lsp_ree/addon.rb

@@ -7,6 +7,7 @@ require_relative "utils/ree_lsp_utils"
 require_relative "ree_formatter"
 require_relative "ree_template_applicator"
 require_relative "ree_rename_handler"
+require_relative "ree_constants"
 require_relative "parsing/parsed_document_builder"
 
 module RubyLsp
@@ -17,7 +18,7 @@ module RubyLsp
         @message_queue = message_queue
         @template_applicator = RubyLsp::Ree::ReeTemplateApplicator.new
 
-        global_state.register_formatter("ree_formatter", RubyLsp::Ree::ReeFormatter.new)
+        global_state.register_formatter("ree_formatter", RubyLsp::Ree::ReeFormatter.new(@message_queue))
         register_additional_file_watchers(global_state, message_queue)
       end
 

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

@@ -1,8 +1,12 @@
 module RubyLsp
   module Ree
     class BaseFormatter
-      def self.call(source, uri)
-        new.call(source, uri)
+      def self.call(source, uri, message_queue)
+        new(message_queue).call(source, uri)
+      end
+
+      def initialize(message_queue)
+        @message_queue = message_queue
       end
 
       def call(source, uri)

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

@@ -11,7 +11,7 @@ module RubyLsp
       def call(source, uri)
         parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(source)
 
-        locales_folder = package_locales_folder_path(URI.parse(uri.to_s).path)
+        locales_folder = package_locales_folder_path(get_uri_path(uri))
         return source if !locales_folder || !File.directory?(locales_folder)
 
         result = []
@@ -34,7 +34,8 @@ module RubyLsp
             unless value
               loc_key = File.basename(locale_file, '.yml')
 
-              add_locale_placeholder(locale_file, key_path)          
+              add_locale_placeholder(locale_file, key_path)    
+              send_message(locale_file, key_path)      
             end
           end
         end
@@ -77,7 +78,20 @@ module RubyLsp
 
         lines = File.read(file_path).lines
         lines[last_found_key.line] += adding_string
-        File.write(file_path, lines.join)
+        
+        new_source = lines.join.force_encoding("utf-8")
+        File.open(file_path, 'wb:UTF-8'){|f|
+          f.write(new_source)
+        }
+        
+        new_source
+      end
+
+      def send_message(locale_file, key_path)   
+        loc_key = File.basename(locale_file, '.yml')
+
+        message = "Missing locale #{loc_key}: #{key_path}"
+        @message_queue << RubyLsp::Notification.window_show_message(message, type: Constant::MessageType::ERROR)
       end
     end
   end

data/lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.rb

@@ -1,5 +1,7 @@
 require_relative "../utils/ree_lsp_utils"
 require_relative "../ree_object_finder"
+require_relative 'const_additional_text_edits_creator'
+require_relative 'method_additional_text_edits_creator'
 
 module RubyLsp
   module Ree
@@ -7,7 +9,7 @@ module RubyLsp
       include Requests::Support::Common
       include RubyLsp::Ree::ReeLspUtils
 
-      RECEIVER_OBJECT_TYPES = [:enum, :dao, :bean]
+      RECEIVER_OBJECT_TYPES = [:enum, :dao, :bean, :async_bean]
       CANDIDATES_LIMIT = 100
 
       def initialize(index, uri, node_context)
@@ -30,7 +32,7 @@ module RubyLsp
         case @finder.object_type(ree_receiver)
         when :enum
           get_enum_values_completion_items(ree_receiver, location)
-        when :bean
+        when :bean, :async_bean
           get_bean_methods_completion_items(ree_receiver, location)
         when :dao
           get_dao_filters_completion_items(ree_receiver, location)
@@ -193,7 +195,7 @@ module RubyLsp
                   new_text: class_name,
                 ),
                 kind: Constant::CompletionItemKind::CLASS,
-                additional_text_edits: get_additional_text_edits_for_constant(parsed_doc, class_name, package_name, entry)
+                additional_text_edits: ConstAdditionalTextEditsCreator.call(parsed_doc, class_name, package_name, entry)
               )
             end
           end
@@ -234,7 +236,7 @@ module RubyLsp
               owner_name: "Object",
               guessed_type: false,
             },
-            additional_text_edits: get_additional_text_edits_for_method(parsed_doc, ree_object_name, package_name)
+            additional_text_edits: MethodAdditionalTextEditsCreator.call(parsed_doc, ree_object_name, package_name)
           )
         end
       end
@@ -269,76 +271,6 @@ module RubyLsp
           end
         end.join(', ')
       end
-
-      def get_additional_text_edits_for_constant(parsed_doc, class_name, package_name, entry)
-        if parsed_doc.includes_linked_constant?(class_name)
-          return []
-        end
-
-        entry_uri = entry.uri.to_s
-
-        link_text = if parsed_doc.package_name == package_name
-          fn_name = File.basename(entry_uri, ".*")
-          "\s\slink :#{fn_name}, import: -> { #{class_name} }"
-        else
-          path = path_from_package_folder(entry_uri)
-          "\s\slink \"#{path}\", import: -> { #{class_name} }"
-        end
-
-        if parsed_doc.links_container_node
-          link_text = "\s\s" + link_text
-        end
-        
-        new_text = "\n" + link_text
-
-
-        if parsed_doc.has_blank_links_container?
-          new_text = "\sdo#{link_text}\n\s\send\n"
-        end
-
-        range = get_range_for_fn_insert(parsed_doc, link_text)
-
-        [
-          Interface::TextEdit.new(
-            range:    range,
-            new_text: new_text,
-          )
-        ]
-      end
-
-      def get_additional_text_edits_for_method(parsed_doc, fn_name, package_name)
-        return [] unless parsed_doc
-
-        if parsed_doc.includes_linked_object?(fn_name)
-          return []
-        end
-
-        link_text = if parsed_doc.package_name == package_name
-          "\s\slink :#{fn_name}"
-        else
-          "\s\slink :#{fn_name}, from: :#{package_name}"
-        end
-
-        if parsed_doc.links_container_node
-          link_text = "\s\s" + link_text
-        end
-        
-        new_text = "\n" + link_text
-
-        if parsed_doc.has_blank_links_container?
-          new_text = "\sdo#{link_text}\n\s\send\n"
-        end
-
-        range = get_range_for_fn_insert(parsed_doc, link_text)
-        return unless range
-
-        [
-          Interface::TextEdit.new(
-            range:    range,
-            new_text: new_text,
-          )
-        ]
-      end
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_ree/handlers/const_additional_text_edits_creator.rb

@@ -0,0 +1,104 @@
+module RubyLsp
+  module Ree
+    class ConstAdditionalTextEditsCreator
+      include RubyLsp::Ree::ReeLspUtils
+
+      def self.call(parsed_doc, const_name, package_name, entry)
+        new(parsed_doc, const_name, package_name, entry).call
+      end
+
+      def initialize(parsed_doc, const_name, package_name, entry)
+        @parsed_doc = parsed_doc
+        @const_name = const_name
+        @package_name = package_name
+        @entry = entry
+      end
+
+      def call
+        if @parsed_doc.includes_linked_constant?(@const_name)
+          return []
+        end
+
+        const_link = get_constant_link
+
+        if existing_link = @parsed_doc.find_link_node(const_link[:object_name])
+          # attach to existing link
+          if existing_link.has_import_section?
+            new_text = "& #{@const_name} }"
+            position = existing_link.location.end_column - 1
+            range = Interface::Range.new(
+              start: Interface::Position.new(line: existing_link.location.start_line-1, character: position),
+              end: Interface::Position.new(line: existing_link.location.start_line-1, character: position + new_text.size),
+            )
+          else
+            if existing_link.object_name_type?
+              new_text = ", import: -> { #{@const_name} }"
+            else
+              new_text = ", -> { #{@const_name} }"
+            end
+
+            position = existing_link.location.end_column + 1
+            range = Interface::Range.new(
+              start: Interface::Position.new(line: existing_link.location.start_line-1, character: position),
+              end: Interface::Position.new(line: existing_link.location.start_line-1, character: position + new_text.size),
+            )
+          end          
+        else
+          # add new link
+
+          link_text = "\s\slink #{const_link[:link_name]}, import: -> { #{@const_name} }"
+
+          if @parsed_doc.links_container_node
+            link_text = "\s\s" + link_text
+          end
+
+          new_text = "\n" + link_text
+
+          if @parsed_doc.has_blank_links_container?
+            new_text = "\sdo#{link_text}\n\s\send\n"
+          end
+
+          range = get_range_for_fn_insert(@parsed_doc, link_text)
+        end
+
+        [
+          Interface::TextEdit.new(
+            range:    range,
+            new_text: new_text,
+          )
+        ]
+      end
+
+      private
+
+      def is_ree_object?(uri)
+        doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_uri(uri)
+        return false if !doc || !doc.has_root_class?
+        
+        doc.parse_links_container_node
+        return !!doc.links_container_node
+      end
+
+      def get_constant_link
+        entry_uri = @entry.uri.to_s
+        
+        ree_obj_name = nil
+        link_name = nil
+
+        if is_ree_object?(@entry.uri)
+          ree_obj_name = File.basename(entry_uri, ".*")
+          link_name = ":#{ree_obj_name}"
+
+          if @package_name != @parsed_doc.package_name
+            link_name += ", from: :#{@package_name}"
+          end
+        else
+          ree_obj_name = path_from_package_folder(entry_uri)
+          link_name = "\"#{ree_obj_name}\""
+        end
+
+        return { link_name: link_name, object_name: ree_obj_name }
+      end
+    end
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/handlers/hover_handler.rb

@@ -85,9 +85,10 @@ module RubyLsp
 
           if value
             if value == MISSING_LOCALE_PLACEHOLDER
-              value_location = find_locale_key_location(locale_file, key_path)
-              file_uri = "#{locale_file}" # TODO add line to uri :#{value_location.line+1}:#{value_location.column}"
-              documentation += "#{loc_key}: [#{value}](#{file_uri})\n\n"
+              # value_location = find_locale_key_location(locale_file, key_path)
+              # file_uri = "file://#{locale_file}##{value_location.line+1}"
+              # link doesn't work with ssh remote mode
+              documentation += "#{loc_key}: #{value}\n\n"
             else
               documentation += "#{loc_key}: #{value}\n\n"
             end
@@ -124,9 +125,10 @@ module RubyLsp
 
           if value
             if value == MISSING_LOCALE_PLACEHOLDER
-              value_location = find_locale_key_location(locale_file, key_path)
-              file_uri = "#{locale_file}" # TODO add line to uri :#{value_location.line+1}:#{value_location.column}"
-              documentation += "#{loc_key}: [#{value}](#{file_uri})\n\n"
+             # value_location = find_locale_key_location(locale_file, key_path)
+              # file_uri = "file://#{locale_file}##{value_location.line+1}"
+              # link doesn't work with ssh remote mode
+              documentation += "#{loc_key}: #{value}\n\n"
             else
               documentation += "#{loc_key}: #{value}\n\n"
             end

data/lib/ruby_lsp/ruby_lsp_ree/handlers/method_additional_text_edits_creator.rb

@@ -0,0 +1,51 @@
+module RubyLsp
+  module Ree
+    class MethodAdditionalTextEditsCreator
+      include RubyLsp::Ree::ReeLspUtils
+
+      def self.call(parsed_doc, ree_object_name, package_name)
+        new(parsed_doc, ree_object_name, package_name).call
+      end
+
+      def initialize(parsed_doc, ree_object_name, package_name)
+        @parsed_doc = parsed_doc
+        @ree_object_name = ree_object_name
+        @package_name = package_name
+      end
+
+      def call
+        return [] unless @parsed_doc
+
+        if @parsed_doc.includes_linked_object?(@ree_object_name)
+          return []
+        end
+
+        link_text = if @parsed_doc.package_name == @package_name
+          "\s\slink :#{@ree_object_name}"
+        else
+          "\s\slink :#{@ree_object_name}, from: :#{@package_name}"
+        end
+
+        if @parsed_doc.links_container_node
+          link_text = "\s\s" + link_text
+        end
+        
+        new_text = "\n" + link_text
+
+        if @parsed_doc.has_blank_links_container?
+          new_text = "\sdo#{link_text}\n\s\send\n"
+        end
+
+        range = get_range_for_fn_insert(@parsed_doc, link_text)
+        return unless range
+
+        [
+          Interface::TextEdit.new(
+            range:    range,
+            new_text: new_text,
+          )
+        ]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+class RubyLsp::Ree::ParsedBaseDocument
+  include RubyLsp::Ree::ReeLspUtils
+
+  attr_reader :ast, :package_name, :link_nodes
+
+  def initialize(ast, package_name = nil)
+    @ast = ast
+    set_package_name(package_name) if package_name
+  end
+
+  def set_package_name(package_name)
+    @package_name = package_name
+  end
+
+  def has_root_class?
+    false
+  end
+
+  def includes_linked_object?(obj_name)
+    @link_nodes.map(&:name).include?(obj_name)
+  end
+
+  def find_link_node(name)
+    @link_nodes.detect{ node_name(_1) == name }
+  end
+
+  def node_name(node)
+    return nil unless node.respond_to?(:name)
+
+    node.name
+  end
+
+  def allows_root_links?
+    raise "abstract method"
+  end
+
+  def has_blank_links_container?
+    raise "abstract method"
+  end
+
+  def links_container_node
+    raise "abstract method"
+  end
+
+  def includes_link_dsl?
+    raise "abstract method"
+  end
+
+  def parse_links
+    raise "abstract method"
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/{parsed_document.rb → parsed_class_document.rb}

@@ -1,47 +1,34 @@
+require_relative 'parsed_base_document'
 require_relative 'parsed_link_node'
 require_relative 'parsed_method_node'
+require_relative "../ree_constants"
 require 'ostruct'
 
-class RubyLsp::Ree::ParsedDocument
+class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
   include RubyLsp::Ree::ReeLspUtils
+  include RubyLsp::Ree::ReeConstants
 
-  LINK_DSL_MODULE = 'Ree::LinkDSL'
-
-  ERROR_DEFINITION_NAMES = [
-    :auth_error,
-    :build_error,
-    :conflict_error,
-    :invalid_param_error,
-    :not_found_error,
-    :payment_required_error,
-    :permission_error,
-    :validation_error
-  ]
-
-  CONTRACT_CALL_NODE_NAMES = [
-    :contract,
-    :throws
-  ]
-
-  attr_reader :ast, :package_name, :class_node, :fn_node, :class_includes,
-    :link_nodes, :values, :action_node, :dao_node, :filters,
-    :bean_node, :bean_methods, :mapper_node, :links_container_block_node, :aggregate_node,
-    :error_definitions, :error_definition_names, :doc_instance_methods
+  attr_reader :class_node, :class_includes, 
+    :values, :filters, :bean_methods, :links_container_block_node, :error_definitions, 
+    :error_definition_names, :doc_instance_methods, :links_container_node
 
   def initialize(ast, package_name = nil)
-    @ast = ast
-    set_package_name(package_name) if package_name
+    super
+    parse_class_node    
   end
 
-  def links_container_node
-    # TODO don't use separate node, use one field for all and additional type field: links_container_node_type
-    @fn_node || @action_node || @dao_node || @bean_node || @mapper_node || @aggregate_node
+  def has_root_class?
+    true
   end
 
   def allows_root_links?
     false
   end
 
+  def has_body?
+    class_node && class_node.body && class_node.body.body
+  end
+
   def includes_link_dsl?
     @class_includes.any?{ node_name(_1) == LINK_DSL_MODULE }
   end
@@ -50,14 +37,6 @@ class RubyLsp::Ree::ParsedDocument
     @link_nodes.map(&:imports).flatten.include?(const_name)
   end
 
-  def includes_linked_object?(obj_name)
-    @link_nodes.map{ node_name(_1) }.include?(obj_name)
-  end
-
-  def find_link_node(name)
-    @link_nodes.detect{ node_name(_1) == name }
-  end
-
   def find_link_with_imported_object(name)
     @link_nodes.detect do |link_node|
       link_node.imports.include?(name)
@@ -74,58 +53,20 @@ class RubyLsp::Ree::ParsedDocument
     links_container_node && !@links_container_block_node
   end
 
-  def set_package_name(package_name)
-    @package_name = package_name
-  end
-
   def parse_class_node
     @class_node ||= ast.statements.body.detect{ |node| node.is_a?(Prism::ClassNode) }
   end
 
-  def parse_fn_node
-    return unless class_node
-
-    @fn_node ||= class_node.body.body.detect{ |node| node_name(node) == :fn }
-    @links_container_block_node ||= @fn_node&.block
-  end
-
-  def parse_action_node
-    return unless class_node
-
-    @action_node ||= class_node.body.body.detect{ |node| node_name(node) == :action }
-    @links_container_block_node ||= @action_node&.block
-  end
-
-  def parse_dao_node
-    return unless class_node
+  def parse_links_container_node
+    return unless has_body?
 
-    @dao_node ||= class_node.body.body.detect{ |node| node_name(node) == :dao }
-    @links_container_block_node ||= @dao_node&.block
-  end
-
-  def parse_bean_node
-    return unless class_node
-
-    @bean_node ||= class_node.body.body.detect{ |node| node_name(node) == :bean }
-    @links_container_block_node ||= @bean_node&.block
-  end
-
-  def parse_mapper_node
-    return unless class_node
-
-    @mapper_node ||= class_node.body.body.detect{ |node| node_name(node) == :mapper }
-    @links_container_block_node ||= @mapper_node&.block
-  end
-
-  def parse_aggregate_node
-    return unless class_node
-
-    @aggregate_node ||= class_node.body.body.detect{ |node| node_name(node) == :aggregate }
-    @links_container_block_node ||= @aggregate_node&.block
+    @links_container_node ||= class_node.body.body.detect{ |node| LINKS_CONTAINER_TYPES.include?(node_name(node)) }
+    @links_container_node_type = node_name(@links_container_node)
+    @links_container_block_node ||= @links_container_node&.block
   end
 
   def parse_class_includes
-    return unless class_node
+    return unless has_body?
 
     @class_includes ||= class_node.body.body.select{ node_name(_1) == :include }.map do |class_include|
       parent_name = class_include.arguments.arguments.first.parent.name.to_s
@@ -138,7 +79,7 @@ class RubyLsp::Ree::ParsedDocument
   end
 
   def parse_links
-    return unless class_node
+    return unless has_body?
 
     nodes = if links_container_node && @links_container_block_node && @links_container_block_node.body
       @links_container_block_node.body.body.select{ |node| node_name(node) == :link }
@@ -156,7 +97,7 @@ class RubyLsp::Ree::ParsedDocument
   end
 
   def parse_values
-    return unless class_node
+    return unless has_body?
     
     @values ||= class_node.body.body
       .select{ node_name(_1) == :val }
@@ -173,8 +114,8 @@ class RubyLsp::Ree::ParsedDocument
   end
 
   def parse_bean_methods
-    return unless class_node
-    
+    return unless has_body?
+
     @bean_methods ||= class_node.body.body
       .select{ _1.is_a?(Prism::DefNode) }
       .map{ OpenStruct.new(name: node_name(_1).to_s, signatures: parse_signatures_from_params(_1.parameters)) }
@@ -214,7 +155,7 @@ class RubyLsp::Ree::ParsedDocument
   end
 
   def parse_error_definitions
-    return unless class_node
+    return unless has_body?
 
     @error_definitions = class_node.body.body
       .select{ _1.is_a?(Prism::ConstantWriteNode) }
@@ -240,12 +181,6 @@ class RubyLsp::Ree::ParsedDocument
     links_container_node.arguments.arguments.first.unescaped
   end
 
-  def node_name(node)
-    return nil unless node.respond_to?(:name)
-
-    node.name
-  end
-
   def imported_constants
     @link_nodes.map(&:imports).flatten.map(&:to_sym)
   end

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

@@ -1,11 +1,13 @@
 require 'prism'
-require_relative 'parsed_document'
+require_relative 'parsed_class_document'
 require_relative 'parsed_rspec_document'
 
 class RubyLsp::Ree::ParsedDocumentBuilder
   extend RubyLsp::Ree::ReeLspUtils
 
   def self.build_from_uri(uri, type = nil)
+    return unless is_ruby_file?(uri)
+    
     ast = Prism.parse_file(uri.path).value
     document = build_document(ast, type, package_name_from_uri(uri))
     return unless document
@@ -14,6 +16,8 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   end
 
   def self.build_from_ast(ast, uri, type = nil)
+    return if uri && !is_ruby_file?(uri)
+
     document = build_document(ast, type, package_name_from_uri(uri))
     return unless document
 
@@ -40,7 +44,7 @@ class RubyLsp::Ree::ParsedDocumentBuilder
 
   def self.build_detected_document_type(ast, package_name = nil)
     if has_root_class?(ast)
-      build_regular_document(ast, package_name)
+      build_class_document(ast, package_name)
     elsif has_root_rspec_call?(ast)
       build_rspec_document(ast)
     else 
@@ -58,23 +62,15 @@ class RubyLsp::Ree::ParsedDocumentBuilder
 
   def self.build_rspec_document(ast)
     document = RubyLsp::Ree::ParsedRspecDocument.new(ast)
-
-    document.parse_describe_node    
     document.parse_links
     
     document
   end
 
-  def self.build_regular_document(ast, package_name)
-    document = RubyLsp::Ree::ParsedDocument.new(ast, package_name)
+  def self.build_class_document(ast, package_name)
+    document = RubyLsp::Ree::ParsedClassDocument.new(ast, package_name)
     
-    document.parse_class_node
-    document.parse_fn_node
-    document.parse_action_node
-    document.parse_bean_node
-    document.parse_dao_node
-    document.parse_mapper_node
-    document.parse_aggregate_node
+    document.parse_links_container_node
     document.parse_class_includes
     document.parse_links
 
@@ -82,7 +78,7 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   end   
 
   def self.build_enum_document(ast)
-    document = RubyLsp::Ree::ParsedDocument.new(ast)
+    document = RubyLsp::Ree::ParsedClassDocument.new(ast)
     
     document.parse_class_node
     document.parse_values
@@ -91,7 +87,7 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   end   
 
   def self.build_dao_document(ast)
-    document = RubyLsp::Ree::ParsedDocument.new(ast)
+    document = RubyLsp::Ree::ParsedClassDocument.new(ast)
     
     document.parse_class_node
     document.parse_filters
@@ -100,11 +96,15 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   end  
   
   def self.build_bean_document(ast)
-    document = RubyLsp::Ree::ParsedDocument.new(ast)
+    document = RubyLsp::Ree::ParsedClassDocument.new(ast)
     
     document.parse_class_node
     document.parse_bean_methods
 
     document
   end  
+
+  def self.is_ruby_file?(uri)
+    File.extname(uri.to_s) == '.rb'
+  end
 end

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

@@ -75,17 +75,31 @@ class RubyLsp::Ree::ParsedLinkNode
     @imports ||= get_imports
   end
 
+  def has_import_section?
+    return false if @node.arguments.arguments.size == 1
+
+    !!import_arg
+  end
+
   private
 
+  def last_arg
+    @node.arguments.arguments.last
+  end
+
+  def import_arg
+    if object_name_type?
+      last_arg.elements.detect{ _1.key.unescaped == IMPORT_ARG_KEY }
+    else
+      last_arg
+    end
+  end
+
   def get_imports
     return [] if @node.arguments.arguments.size == 1
     
-    last_arg = @node.arguments.arguments.last
-
-    if last_arg.is_a?(Prism::KeywordHashNode)
-      import_arg = last_arg.elements.detect{ _1.key.unescaped == IMPORT_ARG_KEY }
+    if object_name_type?
       return [] unless import_arg
-
       [import_arg.value.body.body.first.name.to_s]
     elsif last_arg.is_a?(Prism::LambdaNode)
       [last_arg.body.body.first.name.to_s]

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

@@ -1,7 +1,7 @@
 require 'prism'
 
 class RubyLsp::Ree::ParsedMethodNode
-  attr_reader :method_node, :contract_node
+  attr_reader :method_node, :contract_node, :nested_local_methods
 
   def initialize(method_node, contract_node)
     @method_node = method_node
@@ -39,7 +39,7 @@ class RubyLsp::Ree::ParsedMethodNode
     return @raised_errors if @raised_errors
     return [] unless @method_node.body
 
-    call_objects = parse_body_call_objects(@method_node.body.body)
+    call_objects = parse_body_call_objects(get_method_body(@method_node))
     raise_objects = call_objects.select{ _1.name == :raise }
     @raised_errors = raise_objects.map{ parse_raised_class_name(_1) }.compact
   end
@@ -89,8 +89,10 @@ class RubyLsp::Ree::ParsedMethodNode
       return
     end
 
+    method_body = get_method_body(@method_node)
+
     local_method_names = local_methods.map(&:name)
-    call_nodes = parse_body_call_objects(@method_node.body.body)
+    call_nodes = parse_body_call_objects(method_body)
     call_node_names = call_nodes.map(&:name)
    
     @nested_local_methods = local_methods.select{ call_node_names.include?(_1.name) }
@@ -112,4 +114,12 @@ class RubyLsp::Ree::ParsedMethodNode
 
     call_nodes
   end
+
+  def get_method_body(node)
+    if node.body.is_a?(Prism::BeginNode)
+      node.body.statements.body
+    else
+      node.body.body
+    end
+  end
 end

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

@@ -1,27 +1,21 @@
+require_relative 'parsed_base_document'
 require_relative 'parsed_link_node'
 require 'ostruct'
 
-class RubyLsp::Ree::ParsedRspecDocument
+class RubyLsp::Ree::ParsedRspecDocument < RubyLsp::Ree::ParsedBaseDocument
   include RubyLsp::Ree::ReeLspUtils
 
-  attr_reader :ast, :package_name, :describe_node
+  attr_reader :describe_node
 
-  def initialize(ast)
-    @ast = ast
-  end
-
-  def set_package_name(package_name)
-    @package_name = package_name
+  def initialize(ast, package_name = nil)
+    super
+    parse_describe_node    
   end
 
   def allows_root_links?
     true
   end
 
-  def includes_linked_object?(obj_name)
-    @link_nodes.map(&:name).include?(obj_name)
-  end
-
   def links_container_node
     nil
   end

data/lib/ruby_lsp/ruby_lsp_ree/ree_constants.rb

@@ -0,0 +1,34 @@
+module RubyLsp
+  module Ree
+    module ReeConstants
+      LINK_DSL_MODULE = 'Ree::LinkDSL'
+  
+      LINKS_CONTAINER_TYPES = [
+        :fn,
+        :action,
+        :dao,
+        :bean,
+        :async_bean,
+        :mapper,
+        :aggregate,
+        :enum
+      ]
+
+      ERROR_DEFINITION_NAMES = [
+        :auth_error,
+        :build_error,
+        :conflict_error,
+        :invalid_param_error,
+        :not_found_error,
+        :payment_required_error,
+        :permission_error,
+        :validation_error
+      ]
+
+      CONTRACT_CALL_NODE_NAMES = [
+        :contract,
+        :throws
+      ]
+    end
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/ree_context.rb

@@ -1,18 +1,10 @@
 require 'prism'
+require_relative "ree_constants"
 
 module RubyLsp
   module Ree
     class ReeContext
-      ERROR_DEFINITION_NAMES = [
-        :auth_error,
-        :build_error,
-        :conflict_error,
-        :invalid_param_error,
-        :not_found_error,
-        :payment_required_error,
-        :permission_error,
-        :validation_error
-      ]
+      include RubyLsp::Ree::ReeConstants
 
       def initialize(node_context)
         @node_context = node_context

data/lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb

@@ -10,6 +10,12 @@ module RubyLsp
       include RubyLsp::Ree::ReeLspUtils
       include RubyLsp::Ree::ReeLocaleUtils
 
+      MISSING_LOCALE_PLACEHOLDER = '_MISSING_LOCALE_'
+
+      def initialize(message_queue)
+        @message_queue = message_queue
+      end
+
       def run_formatting(uri, document)
         source = document.source
 
@@ -20,13 +26,12 @@ module RubyLsp
           RubyLsp::Ree::MissingErrorLocalesFormatter
         ]
 
-        formatters.reduce(source){ |s, formatter| formatter.call(s, uri) }
+        formatters.reduce(source){ |s, formatter| formatter.call(s, uri, @message_queue) }
       rescue => e
         $stderr.puts("error in ree_formatter: #{e.message} : #{e.backtrace.first}")
       end
 
       def run_diagnostic(uri, document)
-        $stderr.puts("ree_formatter_diagnostic")
         detect_missing_error_locales(uri, document)
       rescue => e
         $stderr.puts("error in ree_formatter_diagnostic: #{e.message} : #{e.backtrace.first}")
@@ -38,10 +43,11 @@ module RubyLsp
         parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(document.source)
 
         locales_folder = package_locales_folder_path(uri.path)
-        return [] unless File.directory?(locales_folder)
+        return [] if !locales_folder || !File.directory?(locales_folder)
 
         result = []
-        key_paths = []
+        error_keys = []
+
         parsed_doc.parse_error_definitions
         parsed_doc.error_definitions.each do |error_definition|
           key_path = if error_definition.value.arguments.arguments.size > 1
@@ -51,27 +57,24 @@ module RubyLsp
             "#{mod}.errors.#{error_definition.value.arguments.arguments[0].unescaped}"
           end
 
-          key_paths << key_path
+          error_keys << [key_path, error_definition]
         end
 
-        $stderr.puts("ree_formatter_diagnostic #{key_paths}")
-
         Dir.glob(File.join(locales_folder, '**/*.yml')).each do |locale_file|
-          key_paths.each do |key_path|
+          error_keys.each do |error_key|
+            key_path = error_key[0]
             value = find_locale_value(locale_file, key_path)
-            unless value
+            if !value || value == MISSING_LOCALE_PLACEHOLDER
               loc_key = File.basename(locale_file, '.yml')
+              error_definition = error_key[1]
 
-              $stderr.puts("ree_formatter_diagnostic add diagnostic")
-
-              # TODO correct error range
               result << RubyLsp::Interface::Diagnostic.new(
                 message: "Missing locale #{loc_key}: #{key_path}",
                 source: "Ree formatter",
                 severity: RubyLsp::Constant::DiagnosticSeverity::ERROR,
                 range: RubyLsp::Interface::Range.new( 
-                  start: RubyLsp::Interface::Position.new(line: 0, character: 0),
-                  end: RubyLsp::Interface::Position.new(line: 0, character: 0),
+                  start: RubyLsp::Interface::Position.new(line: error_definition.location.start_line-1, character: error_definition.name_loc.start_column),
+                  end: RubyLsp::Interface::Position.new(line: error_definition.location.start_line-1, character: error_definition.name_loc.end_column),
                 ),
               )
             end

data/lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb

@@ -6,7 +6,7 @@ module RubyLsp
     class ReeIndexingEnhancement < RubyIndexer::Enhancement
       include RubyLsp::Ree::ReeLspUtils
 
-      REE_INDEXED_OBJECTS = [:fn, :enum, :action, :dao, :bean, :mapper, :aggregate]
+      REE_INDEXED_OBJECTS = [:fn, :enum, :action, :dao, :bean, :mapper, :aggregate, :async_bean]
 
       def on_call_node_enter(node)
         return unless @listener.current_owner

data/lib/ruby_lsp/ruby_lsp_ree/ree_object_finder.rb

@@ -8,11 +8,6 @@ module RubyLsp
       MAX_LIMIT = 1000
 
       REE_OBJECT_STRING = 'ree_object'
-      ENUM_TYPE_STRING = 'type: :enum'
-      DAO_TYPE_STRING = 'type: :dao'
-      BEAN_TYPE_STRING = 'type: :bean'
-      MAPPER_TYPE_STRING = 'type: :mapper'
-      AGGREGATE_TYPE_STRING = 'type: :aggregate'
 
       def initialize(index)
         @index = index
@@ -60,27 +55,6 @@ module RubyLsp
         objects_by_name.select{ types.include?(object_type(_1)) }
       end
 
-      def find_enum(name)
-        objects_by_name = @index[name]
-        return unless objects_by_name
-
-        objects_by_name.detect{ _1.comments.lines[1]&.chomp == ENUM_TYPE_STRING }
-      end
-
-      def find_dao(name)
-        objects_by_name = @index[name]
-        return unless objects_by_name
-
-        objects_by_name.detect{ _1.comments.lines[1]&.chomp == DAO_TYPE_STRING }
-      end
-
-      def find_bean(index, name)
-        objects_by_name = @index[name]
-        return unless objects_by_name
-
-        objects_by_name.detect{ _1.comments.lines[1]&.chomp == BEAN_TYPE_STRING }
-      end
-
       def object_type(ree_object)
         type_str = ree_object.comments.lines[1]&.chomp
         return unless type_str

data/lib/ruby_lsp/ruby_lsp_ree/ree_rename_handler.rb

@@ -4,15 +4,23 @@ module RubyLsp
       include RubyLsp::Ree::ReeLspUtils
 
       def self.call(changes)
+        new.call(changes)
+      end
+
+      def call(changes)
         old_uri = URI.parse(changes.detect{ _1[:type] == Constant::FileChangeType::DELETED }[:uri])
         new_uri = URI.parse(changes.detect{ _1[:type] == Constant::FileChangeType::CREATED }[:uri])
+      
+        old_path = get_uri_path(old_uri)
+        new_path = get_uri_path(new_uri)
 
-        old_file_name = File.basename(old_uri, '.rb')
-        new_file_name = File.basename(new_uri, '.rb')
+        old_file_name = File.basename(old_path, '.rb').chomp(" copy")
+        new_file_name = File.basename(new_path, '.rb')
 
         return if old_file_name == new_file_name
 
         parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_uri(new_uri)
+
         return if !parsed_doc || !parsed_doc.class_node
 
         old_class_name = old_file_name.split('_').collect(&:capitalize).join
@@ -20,7 +28,7 @@ module RubyLsp
 
         return unless parsed_doc.class_name == old_class_name
 
-        file_content_lines = File.read(new_uri.path).lines
+        file_content_lines = File.read(new_path).lines
         
         class_line = parsed_doc.class_node.location.start_line - 1
 
@@ -32,7 +40,7 @@ module RubyLsp
           file_content_lines[links_container_node_line].gsub!(/\b#{old_file_name}\b/, new_file_name)
         end
 
-        File.write(new_uri.path, file_content_lines.join)
+        File.write(new_path, file_content_lines.join)
       end
     end
   end

data/lib/ruby_lsp/ruby_lsp_ree/ree_template_applicator.rb

@@ -23,7 +23,9 @@ module RubyLsp
 
       def apply(change_item)
         uri = change_item[:uri]
-        path = URI.parse(uri).path
+        path = get_uri_path(uri)
+
+        return unless File.exist?(path)
 
         file_content = File.read(path)
         return if file_content.size > 0

data/lib/ruby_lsp/ruby_lsp_ree/utils/ree_lsp_utils.rb

@@ -3,6 +3,10 @@ module RubyLsp
     module ReeLspUtils
       Entry = RubyIndexer::Entry
 
+      def get_uri_path(uri)
+        URI.decode_www_form_component(URI.parse(uri.to_s).path)
+      end
+
       def find_local_file_path(file_path)
         file_name = file_path + ".rb"
         Dir[File.join('**', file_name)].first
@@ -64,8 +68,8 @@ module RubyLsp
             links_container_node.arguments.location.end_column + 1
           end
         elsif parsed_doc.includes_link_dsl?
-          fn_line = parsed_doc.link_nodes.first.location.start_line - 1
-          position = parsed_doc.link_nodes.first.location.start_column
+          fn_line = parsed_doc.link_nodes.last.location.start_line
+          position = parsed_doc.link_nodes.last.location.end_column + 1
         elsif parsed_doc.allows_root_links?
           root_node_location = parsed_doc.root_node_line_location
          

data/lib/ruby_lsp/ruby_lsp_ree/utils/yaml_file_parser.rb

@@ -11,7 +11,7 @@ module RubyLsp
     class YamlFileParser
       def self.parse(file_path)
         parser = Psych::Parser.new(Psych::TreeBuilder.new)
-        parser.parse(File.read(file_path))
+        parser.parse(File.read(file_path, encoding: 'utf-8'))
 
         parse_result = NodeVisitor.create.accept(parser.handler.root)
         normalize_hash_keys(parse_result.first)
@@ -19,7 +19,7 @@ module RubyLsp
 
       def self.parse_with_key_coordinates(file_path)
         parser = Psych::Parser.new(Psych::TreeBuilder.new)
-        parser.parse(File.read(file_path))
+        parser.parse(File.read(file_path, encoding: 'utf-8'))
 
         NodeVisitor.create.accept(parser.handler.root).first
       end

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.9"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-03-21 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email:
@@ -32,16 +32,20 @@ files:
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_locales_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/sort_links_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.rb
+- lib/ruby_lsp/ruby_lsp_ree/handlers/const_additional_text_edits_creator.rb
 - lib/ruby_lsp/ruby_lsp_ree/handlers/definition_handler.rb
 - lib/ruby_lsp/ruby_lsp_ree/handlers/hover_handler.rb
+- lib/ruby_lsp/ruby_lsp_ree/handlers/method_additional_text_edits_creator.rb
 - lib/ruby_lsp/ruby_lsp_ree/listeners/completion_listener.rb
 - lib/ruby_lsp/ruby_lsp_ree/listeners/definition_listener.rb
 - lib/ruby_lsp/ruby_lsp_ree/listeners/hover_listener.rb
-- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_document.rb
+- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_base_document.rb
+- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_class_document.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_document_builder.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_link_node.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_method_node.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_rspec_document.rb
+- lib/ruby_lsp/ruby_lsp_ree/ree_constants.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_context.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb