ruby-lsp-ree 0.1.2 → 0.1.4

data/lib/ruby_lsp/ruby_lsp_ree/listeners/hover_listener.rb

@@ -0,0 +1,42 @@
+require_relative "../handlers/hover_handler"
+
+module RubyLsp
+  module Ree
+    class HoverListener
+      include RubyLsp::Ree::ReeLspUtils
+
+      def initialize(response_builder, node_context, index, dispatcher)
+        @response_builder = response_builder
+        @handler = RubyLsp::Ree::HoverHandler.new(index, node_context)
+
+        dispatcher.register(self, :on_call_node_enter)
+        dispatcher.register(self, :on_constant_read_node_enter)
+      end
+
+      def on_constant_read_node_enter(node)
+        # ree_object = @finder.search_classes(node.name.to_s).first
+
+        # $stderr.puts("ree_object #{ree_object.inspect}")
+
+        # return unless ree_object
+
+        # $stderr.puts("ree_object comm #{ree_object.comments.to_s}")
+
+        # @response_builder.push(ree_object.comments.to_s, category: :documentation)
+      end
+
+      def on_call_node_enter(node)
+        hover_items = @handler.get_ree_object_hover_items(node)
+        put_items_into_response(hover_items)
+      rescue => e
+        $stderr.puts("error in hover listener(on_call_node_enter): #{e.message} : #{e.backtrace.first}")
+      end
+
+      def put_items_into_response(items)
+        items.each do |item|
+          @response_builder.push(item, category: :documentation)
+        end
+      end
+    end
+  end
+end

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

@@ -1,28 +1,30 @@
 require_relative 'parsed_link_node'
+require 'ostruct'
 
 class RubyLsp::Ree::ParsedDocument
   include RubyLsp::Ree::ReeLspUtils
 
   LINK_DSL_MODULE = 'Ree::LinkDSL'
 
-  attr_reader :ast, :package_name, :class_node, :fn_node, :fn_block_node, :class_includes,
-    :link_nodes, :values, :action_node, :action_block_node, :dao_node, :dao_block_node, :filters,
-    :bean_node, :bean_block_node, :bean_methods
+  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
 
   def initialize(ast)
     @ast = ast
   end
 
   def links_container_node
-    @fn_node || @action_node || @dao_node || @bean_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
   end
 
-  def links_container_block_node
-    @fn_block_node || @action_block_node || @dao_block_node || @bean_block_node
+  def allows_root_links?
+    false
   end
 
   def includes_link_dsl?
-    @class_includes.any?{ _1.name == LINK_DSL_MODULE }
+    @class_includes.any?{ node_name(_1) == LINK_DSL_MODULE }
   end
 
   def includes_linked_constant?(const_name)
@@ -30,11 +32,27 @@ class RubyLsp::Ree::ParsedDocument
   end
 
   def includes_linked_object?(obj_name)
-    @link_nodes.map(&:name).include?(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)
+    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
+    links_container_node && !@links_container_block_node
   end
 
   def set_package_name(package_name)
@@ -48,35 +66,49 @@ class RubyLsp::Ree::ParsedDocument
   def parse_fn_node
     return unless class_node
 
-    @fn_node ||= class_node.body.body.detect{ |node| node.name == :fn }
-    @fn_block_node = @fn_node&.block
+    @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 == :action }
-    @action_block_node = @action_node&.block
+    @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
 
-    @dao_node ||= class_node.body.body.detect{ |node| node.name == :dao }
-    @dao_block_node = @dao_node&.block
+    @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 == :bean }
-    @bean_block_node = @bean_node&.block
+    @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
   end
 
   def parse_class_includes
     return unless class_node
 
-    @class_includes ||= class_node.body.body.select{ _1.name == :include }.map do |class_include|
+    @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
       module_name = class_include.arguments.arguments.first.name
     
@@ -89,10 +121,10 @@ class RubyLsp::Ree::ParsedDocument
   def parse_links
     return unless class_node
 
-    nodes = if links_container_node && links_container_block_node.body
-      links_container_block_node.body.body.select{ |node| node.name == :link }
-    elsif class_includes.any?{ _1.name == LINK_DSL_MODULE }
-      class_node.body.body.select{ |node| node.name == :link }
+    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 }
+    elsif class_includes.any?{ node_name(_1) == LINK_DSL_MODULE }
+      class_node.body.body.select{ |node| node_name(node) == :link }
     else
       []
     end
@@ -108,7 +140,7 @@ class RubyLsp::Ree::ParsedDocument
     return unless class_node
     
     @values ||= class_node.body.body
-      .select{ _1.name == :val }
+      .select{ node_name(_1) == :val }
       .map{ OpenStruct.new(name: _1.arguments.arguments.first.unescaped) }
   end
 
@@ -116,7 +148,7 @@ class RubyLsp::Ree::ParsedDocument
     return unless class_node
     
     @filters ||= class_node.body.body
-      .select{ _1.name == :filter }
+      .select{ node_name(_1) == :filter }
       .map{ OpenStruct.new(name: _1.arguments.arguments.first.unescaped, signatures: parse_filter_signature(_1)) }
 
   end
@@ -126,7 +158,7 @@ class RubyLsp::Ree::ParsedDocument
     
     @bean_methods ||= class_node.body.body
       .select{ _1.is_a?(Prism::DefNode) }
-      .map{ OpenStruct.new(name: _1.name.to_s, signatures: parse_signatures_from_params(_1.parameters)) }
+      .map{ OpenStruct.new(name: node_name(_1).to_s, signatures: parse_signatures_from_params(_1.parameters)) }
   end
 
   def parse_filter_signature(filter_node)
@@ -147,4 +179,10 @@ class RubyLsp::Ree::ParsedDocument
     name_parts = [class_node.constant_path&.parent&.name, class_node.constant_path.name]
     name_parts.compact.map(&:to_s).join('::')
   end
+
+  def node_name(node)
+    return nil unless node.respond_to?(:name)
+
+    node.name
+  end
 end

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

@@ -1,5 +1,6 @@
 require 'prism'
 require_relative 'parsed_document'
+require_relative 'parsed_rspec_document'
 
 class RubyLsp::Ree::ParsedDocumentBuilder
   extend RubyLsp::Ree::ReeLspUtils
@@ -7,6 +8,7 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   def self.build_from_uri(uri, type = nil)
     ast = Prism.parse_file(uri.path).value
     document = build_document(ast, type)
+    return unless document
 
     document.set_package_name(package_name_from_uri(uri))
 
@@ -15,6 +17,7 @@ class RubyLsp::Ree::ParsedDocumentBuilder
 
   def self.build_from_ast(ast, uri, type = nil)
     document = build_document(ast, type)
+    return unless document
 
     document.set_package_name(package_name_from_uri(uri))
 
@@ -35,10 +38,37 @@ class RubyLsp::Ree::ParsedDocumentBuilder
     when :bean
       build_bean_document(ast)
     else
+      build_detected_doument_type(ast)
+    end
+  end
+
+  def self.build_detected_doument_type(ast)
+    if has_root_class?(ast)
       build_regular_document(ast)
+    elsif has_root_rspec_call?(ast)
+      build_rspec_document(ast)
+    else 
+      nil
     end
   end
 
+  def self.has_root_class?(ast)
+    ast.statements.body.detect{ |node| node.is_a?(Prism::ClassNode) }
+  end
+
+  def self.has_root_rspec_call?(ast)
+    ast.statements.body.detect{ |node| node.is_a?(Prism::CallNode) && node.name == :describe }
+  end
+
+  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)
     document = RubyLsp::Ree::ParsedDocument.new(ast)
     
@@ -47,6 +77,8 @@ class RubyLsp::Ree::ParsedDocumentBuilder
     document.parse_action_node
     document.parse_bean_node
     document.parse_dao_node
+    document.parse_mapper_node
+    document.parse_aggregate_node
     document.parse_class_includes
     document.parse_links
 

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

@@ -13,7 +13,12 @@ class RubyLsp::Ree::ParsedLinkNode
   end
 
   def link_package_name
-    from_arg_value || document_package
+    case link_type
+    when :object_name
+      from_arg_value || document_package
+    when :file_path
+      @name.split('/').first
+    end
   end
 
   def location

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

@@ -0,0 +1,57 @@
+require_relative 'parsed_link_node'
+require 'ostruct'
+
+class RubyLsp::Ree::ParsedRspecDocument
+  include RubyLsp::Ree::ReeLspUtils
+
+  attr_reader :ast, :package_name, :describe_node
+
+  def initialize(ast)
+    @ast = ast
+  end
+
+  def set_package_name(package_name)
+    @package_name = package_name
+  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
+
+  def root_node_line_location
+    OpenStruct.new(
+      start_line: @describe_node.location.start_line,
+      end_column: @describe_node.block.opening_loc.end_column
+    )
+  end
+
+  def has_blank_links_container?
+    false
+  end
+
+  def includes_link_dsl?
+    false
+  end
+
+  def parse_describe_node
+    @describe_node ||= @ast.statements.body.detect{ |node| node.is_a?(Prism::CallNode) && node.name == :describe }
+  end
+
+  def parse_links
+    nodes = @describe_node.block.body.body.select{ |node| node.name == :link }
+
+    @link_nodes = nodes.map do |link_node|
+      link_node = RubyLsp::Ree::ParsedLinkNode.new(link_node, package_name)
+      link_node.parse_imports
+      link_node
+    end
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb

@@ -10,6 +10,8 @@ module RubyLsp
       def run_formatting(uri, document)
         source = document.source
         sort_links(source)
+      rescue => e
+        $stderr.puts("error in ree_formatter: #{e.message} : #{e.backtrace.first}")
       end
 
       private

data/lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb

@@ -1,12 +1,12 @@
 require 'prism'
-require_relative "ree_lsp_utils"
+require_relative "utils/ree_lsp_utils"
 
 module RubyLsp
   module Ree
     class ReeIndexingEnhancement < RubyIndexer::Enhancement
       include RubyLsp::Ree::ReeLspUtils
 
-      REE_INDEXED_OBJECTS = [:fn, :enum, :action, :dao, :bean]
+      REE_INDEXED_OBJECTS = [:fn, :enum, :action, :dao, :bean, :mapper, :aggregate]
 
       def on_call_node_enter(node)
         return unless @listener.current_owner
@@ -33,8 +33,8 @@ module RubyLsp
       private
 
       def parse_signatures(fn_name)
-        uri = @listener.instance_variable_get(:@uri)
-        ast = Prism.parse_file(uri.path).value
+        source = @listener.instance_variable_get(:@source_lines).join
+        ast = Prism.parse(source).value
 
         class_node = ast.statements.body.detect{ |node| node.is_a?(Prism::ClassNode) }
         return [] unless class_node

data/lib/ruby_lsp/ruby_lsp_ree/ree_object_finder.rb

@@ -7,9 +7,15 @@ module RubyLsp
       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 self.search_objects(index, name, limit)
-        index.prefix_search(name)
+      def initialize(index)
+        @index = index
+      end
+
+      def search_objects(name, limit)
+        @index.prefix_search(name)
           .take(MAX_LIMIT)
           .flatten
           .select{ _1.comments }
@@ -18,26 +24,69 @@ module RubyLsp
           .take(limit)
       end
 
-      def self.find_enum(index, name)
-        objects_by_name = index[name]
+      def search_class_objects(name)
+        @index
+          .names
+          .select{ _1.split('::').last[0...name.size] == name}
+      end
+
+      def search_classes(name)
+        keys = search_class_objects(name)
+        @index.instance_variable_get(:@entries).values_at(*keys)
+      end
+
+      def find_object(name)
+        objects_by_name = @index[name]
+        return unless objects_by_name
+
+        objects_by_name.detect{ _1.comments.to_s.lines.first&.chomp == REE_OBJECT_STRING }
+      end
+
+      def find_objects_by_types(name, types)
+        objects_by_name = @index[name]
+        return [] unless objects_by_name
+
+        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 self.find_dao(index, name)
-        objects_by_name = index[name]
+      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 self.find_bean(index, name)
-        objects_by_name = index[name]
+      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)
+        # TODO rewrite to use string split
+        case ree_object.comments.lines[1]&.chomp
+        when DAO_TYPE_STRING
+          :dao
+        when BEAN_TYPE_STRING
+          :bean
+        when ENUM_TYPE_STRING
+          :enum
+        when MAPPER_TYPE_STRING
+          :mapper
+        when AGGREGATE_TYPE_STRING
+          :aggregate
+        else
+          nil
+        end
+      end
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_ree/{ree_lsp_utils.rb → utils/ree_lsp_utils.rb}

@@ -18,7 +18,7 @@ module RubyLsp
       end
 
       def path_from_package_folder(uri)
-        uri_parts = uri.chomp(File.extname(uri)).split('/')
+        uri_parts = uri.to_s.chomp(File.extname(uri)).split('/')
 
         package_folder_index = uri_parts.index('package')
         return unless package_folder_index
@@ -49,6 +49,13 @@ module RubyLsp
         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
+        elsif parsed_doc.allows_root_links?
+          root_node_location = parsed_doc.root_node_line_location
+         
+          fn_line = root_node_location.start_line
+          position = root_node_location.end_column + 1
+        else
+          return nil
         end
 
         Interface::Range.new(

data/lib/ruby_lsp_ree/version.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-module Ruby
-  module Lsp
-    module Ree
-      VERSION = "0.1.2"
-    end
+module RubyLsp
+  module Ree
+    VERSION = "0.1.4"
   end
 end

data/ruby-lsp-ree.gemspec

@@ -4,7 +4,7 @@ require_relative "lib/ruby_lsp_ree/version"
 
 Gem::Specification.new do |spec|
   spec.name = "ruby-lsp-ree"
-  spec.version = Ruby::Lsp::Ree::VERSION
+  spec.version = RubyLsp::Ree::VERSION
   spec.authors = ["Ruslan Gatiyatov"]
   spec.email = ["ruslan.gatiyatov@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email:
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -25,16 +26,20 @@ files:
 - README.md
 - Rakefile
 - lib/ruby_lsp/ruby_lsp_ree/addon.rb
-- lib/ruby_lsp/ruby_lsp_ree/completion.rb
-- lib/ruby_lsp/ruby_lsp_ree/completion_utils.rb
-- lib/ruby_lsp/ruby_lsp_ree/definition.rb
+- lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.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/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_document_builder.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_link_node.rb
+- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_rspec_document.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb
-- lib/ruby_lsp/ruby_lsp_ree/ree_lsp_utils.rb
 - lib/ruby_lsp/ruby_lsp_ree/ree_object_finder.rb
+- lib/ruby_lsp/ruby_lsp_ree/utils/ree_lsp_utils.rb
 - lib/ruby_lsp_ree.rb
 - lib/ruby_lsp_ree/version.rb
 - ruby-lsp-ree.gemspec
@@ -61,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Ruby LSP addon for Ree framework.