ruby-lsp-ree 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ce3da4d64d7bb6e48fe5691055ca3f78f3455f27c72c63ddc5691e56bddd6c
-  data.tar.gz: 5f5371e99f045a27c434f73acb1f3eaa7191c02e3d25a6cbbc1f6de304f798f6
+  metadata.gz: d23029bb34a76a14f958b8b3e5eab820f8cba36689edb56e6631c413b582cab6
+  data.tar.gz: 53019d360a4b95981c22b7f9a38392b1fcf103146258b9e3510728dfc0fafa2a
 SHA512:
-  metadata.gz: 8fa9a236ddb1e5bef4b79170423f79e566c98f9fceae7baae5ef8a62595d2eff5e321016da8c23f1565b864a714dbb5e9c68caf04b301fdeed03efefe65e98ea
-  data.tar.gz: '079e28850e8302a889f556d9844cae69d5be21cff0b0d389c68445acbf907091d96965319c5c291a0b8c964c3945c27a72835fc393c0d56974b6f05be8235a6a'
+  metadata.gz: 6ee0262d2ea64ea404027224327333d7a4c65ec6389fbebb6718cf0e8af1298f23e6146740f061f02378debe68e7ff0ef4375609bc72e6e52ad28e87e04d4ea1
+  data.tar.gz: ad6b4dea9ef74a883467e61025af3cf7db897eca3414953e5b2a477fdba76e47a93e90b79b03d717672050a9f235ac3e1caa56495a994be64c9f6718e4e2b8ec

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+4.0.1

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem "rake", "~> 13.0"
 
 group :test do
+  gem 'ostruct'
   gem 'rspec'
   gem 'ruby-lsp', '~> 0.25.0'
   gem "sorbet-static-and-runtime"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-lsp-ree (0.1.25)
+    ruby-lsp-ree (0.1.27)
 
 GEM
   remote: https://rubygems.org/
@@ -9,6 +9,7 @@ GEM
     diff-lcs (1.6.0)
     language_server-protocol (3.17.0.4)
     logger (1.6.6)
+    ostruct (0.6.3)
     prism (1.3.0)
     rake (13.2.1)
     rbs (3.8.1)
@@ -40,10 +41,13 @@ GEM
       sorbet-runtime (= 0.5.11835)
 
 PLATFORMS
+  arm64-darwin-24
+  x86_64-darwin-22
   x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
+  ostruct
   rake (~> 13.0)
   rspec
   ruby-lsp (~> 0.25.0)
@@ -51,4 +55,4 @@ DEPENDENCIES
   sorbet-static-and-runtime
 
 BUNDLED WITH
-   2.6.3
+  4.0.6

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

@@ -29,6 +29,7 @@ module RubyLsp
         objects_to_add.uniq!{ |obj| obj.name }
         objects_to_add.reject!{ |obj| IGNORE_METHOD_CALL_NAMES.include?(obj.name) }
         objects_to_add.reject!{ |obj| parsed_doc.includes_linked_object?(obj.name) }
+        objects_to_add.reject!{ |obj| parsed_doc.includes_special_object?(obj.name) }
         return editor.source if objects_to_add.size == 0
         
         editor.add_links(parsed_doc, objects_to_add, current_package)

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

@@ -51,7 +51,10 @@ module RubyLsp
 
         if removed_links == links_count
           parsed_doc.parse_links_container_node
-          editor.remove_link_block(parsed_doc.links_container_node, parsed_doc.links_container_block_node)
+
+          if !has_non_link_dsl_calls?(parsed_doc)
+            editor.remove_link_block(parsed_doc.links_container_node, parsed_doc.links_container_block_node)
+          end
         end
 
         editor.source
@@ -66,6 +69,17 @@ module RubyLsp
       def link_object_is_used?(parsed_doc, link_node, linked_object)
         editor.contains_linked_object_usage?(parsed_doc, link_node, linked_object) || dsl_parser.contains_object_usage?(linked_object.usage_name)
       end
+
+      NON_LINK_DSL_METHODS = [:benchmark, :singleton, :freeze, :with_caller, :factory, :after_init, :target, :tags].freeze
+
+      def has_non_link_dsl_calls?(parsed_doc)
+        block_node = parsed_doc.links_container_block_node
+        return false unless block_node&.body&.body
+
+        block_node.body.body.any? do |node|
+          node.is_a?(Prism::CallNode) && NON_LINK_DSL_METHODS.include?(node.name)
+        end
+      end
     end
   end
 end

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

@@ -48,7 +48,7 @@ class RubyLsp::Ree::BodyObjectsParser < RubyLsp::Ree::BasicParser
         if node.receiver
           target_objects += parse([node.receiver])
         else
-          next if node.name == :link || node.name == :import # don't parse objects inside links
+          next if node.name == :link || node.name == :import || node.name == :benchmark # don't parse objects inside links/dsl calls
 
           if @target_type == :call_object
             target_objects << CallObject.new(name: node.name, type: :method_call)
@@ -101,6 +101,10 @@ class RubyLsp::Ree::BodyObjectsParser < RubyLsp::Ree::BasicParser
           target_objects += parse(node.parts)
         end
 
+        if node.respond_to?(:exceptions) && node.exceptions
+          target_objects += parse(node.exceptions)
+        end
+
         if node.respond_to?(:rescue_clause) && node.rescue_clause
           target_objects += parse([node.rescue_clause])
         end
@@ -120,6 +124,10 @@ class RubyLsp::Ree::BodyObjectsParser < RubyLsp::Ree::BasicParser
             target_objects += parse([node.body])
           end
         end
+
+        if node.respond_to?(:arguments) && node.arguments
+          target_objects += parse_target_objects_from_args(node.arguments)
+        end
       end
 
       if node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)

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

@@ -40,6 +40,10 @@ class RubyLsp::Ree::ParsedBaseDocument
     @link_nodes.map(&:linked_objects).flatten.map(&:name).include?(obj_name)
   end
 
+  def includes_special_object?(obj_name)
+    false
+  end
+
   def find_link_node(name)
     @link_nodes.detect{ node_name(_1) == name }
   end

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

@@ -75,13 +75,23 @@ class RubyLsp::Ree::ParsedDocumentBuilder
   end
 
   def self.build_class_document(ast, package_name)
-    document = RubyLsp::Ree::ParsedClassDocument.new(ast, package_name)
-    
+    if has_build_dto?(ast)
+      document = RubyLsp::Ree::ParsedEntityDocument.new(ast, package_name)
+    else
+      document = RubyLsp::Ree::ParsedClassDocument.new(ast, package_name)
+    end
+
     document.parse_links_container_node
     document.parse_class_includes
     document.parse_links
 
     document
+  end
+
+  def self.has_build_dto?(ast)
+    class_node = ast.statements.body.detect{ |node| node.is_a?(Prism::ClassNode) }
+    return false unless class_node&.body&.body
+    class_node.body.body.any? { |node| node.is_a?(Prism::CallNode) && node.name == :build_dto }
   end   
 
   def self.build_enum_document(ast)

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

@@ -1,7 +1,7 @@
 class RubyLsp::Ree::ParsedEntityDocument < RubyLsp::Ree::ParsedClassDocument
   include RubyLsp::Ree::ReeLspUtils
 
-  attr_reader :columns, :build_dto_node
+  attr_reader :columns, :build_dto_node, :collections
 
   class EntityField
     attr_reader :name, :location
@@ -12,12 +12,25 @@ class RubyLsp::Ree::ParsedEntityDocument < RubyLsp::Ree::ParsedClassDocument
     end
   end
 
+  class EntityCollection
+    attr_reader :name, :location
+
+    def initialize(name:, location:)
+      @name = name
+      @location = location
+    end
+  end
+
   def initialize(ast, package_name = nil)
     super
     parse_class_includes
     parse_build_dto_structure
   end
 
+  def includes_special_object?(obj_name)
+    super || @collections.map(&:name).include?(obj_name)
+  end
+
   private 
 
   def parse_build_dto_structure
@@ -37,5 +50,15 @@ class RubyLsp::Ree::ParsedEntityDocument < RubyLsp::Ree::ParsedClassDocument
           location: _1.location
         )
       end
+
+    @collections = @build_dto_node.block.body.body
+      .select{ _1.name == :collection }
+      .map do
+        EntityCollection.new(
+          name: _1.arguments.arguments.first.unescaped,
+          location: _1.location
+        )
+      end
+
   end
 end

data/lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb

@@ -81,7 +81,7 @@ module RubyLsp
         when Prism::StringNode
           str_node.unescaped
         when Prism::InterpolatedStringNode
-          str_node.parts.map(&:unescaped).join
+          str_node.parts.select{ it.is_a?(Prism::StringNode) }.map(&:unescaped).join
         else
           ''
         end

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.25"
+    VERSION = "0.1.27"
   end
 end

data/ruby-lsp-ree.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "A Ruby LSP addon that adds extra editor functionality for Ree applications"
   spec.homepage = "https://github.com/glabix/ree/tree/main/ruby-lsp-ree"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.4"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/glabix/ree/tree/main/ruby-lsp-ree"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.27
 platform: ruby
 authors:
 - Ruslan Gatiyatov
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-07-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email:
@@ -87,7 +86,6 @@ metadata:
   homepage_uri: https://github.com/glabix/ree/tree/main/ruby-lsp-ree
   source_code_uri: https://github.com/glabix/ree/tree/main/ruby-lsp-ree
   changelog_uri: https://github.com/glabix/ree/blob/main/ruby-lsp-ree/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,15 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby LSP addon for Ree framework.
 test_files: []