ruby-lsp-ree 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149a5de21eba9546be0724fa9af412299bb013bb4f413ff0f59d8ba8676261d8
-  data.tar.gz: bf136b0f946e1d79c43a67c29e32084b3aa90f8f4725984063789ec91c3e3404
+  metadata.gz: d8c04abd3209490247cd5ba187ba8ad2e771feb891fc03c283301b2fbdc7903b
+  data.tar.gz: d4bc2bc8073d181b26ef8b2e007e6e50f511e704525c22a53067bcad0cf8ddf0
 SHA512:
-  metadata.gz: 792a7249438e7b086bc98b274077a2fb3af406558167bb0a910a4787440550da742a90d7a97a1e5bd56b8db8c15abc2848d835812c90d275a4d0169ae32b156e
-  data.tar.gz: 31dbbcc00c85d4cfc9913e156589f112809e73d8b4d80ac27f6f9ca4d481c383c3e4adb7ed131e2c9d002bc0224dfce545761bde2c5d8fc78d1883a440abda61
+  metadata.gz: 573a165703a4a782a8453fe0494310fb8845f7983c61a1d13ad8e05021fa2dba456302a2278c53efeeddb03afcdde4ed637239efbf814419301170592fa9eb60
+  data.tar.gz: fcd8df3fd0f56bb5183a94a276d2e40112a62d04679c73648e630ed791349deb32a95c3ecf2d2098b64f2dbb730999c08a1c7a4f82a348fa2e1c4bc2e997c5ab

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.4.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.1.25] - 2025-07-11
+
+- links section sorting - remove new lines between groups
+- fixed go-to-definition for consts from imports 
+
 ## [0.1.24] - 2025-06-27
 
 - ree 1.2 syntax support

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-lsp-ree (0.1.24)
+    ruby-lsp-ree (0.1.25)
 
 GEM
   remote: https://rubygems.org/
@@ -26,11 +26,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    ruby-lsp (0.23.11)
+    ruby-lsp (0.25.0)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
-      sorbet-runtime (>= 0.5.10782)
+      rbs (>= 3, < 5)
     sorbet (0.5.11835)
       sorbet-static (= 0.5.11835)
     sorbet-runtime (0.5.11835)
@@ -41,13 +40,14 @@ GEM
       sorbet-runtime (= 0.5.11835)
 
 PLATFORMS
+  x86_64-darwin-22
   x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
   rake (~> 13.0)
   rspec
-  ruby-lsp
+  ruby-lsp (~> 0.25.0)
   ruby-lsp-ree!
   sorbet-static-and-runtime
 

data/lib/ruby_lsp/ruby_lsp_ree/completion/completion_items_mapper.rb

@@ -90,7 +90,7 @@ module RubyLsp
         end
       end
 
-      def map_class_name_objects(class_name_objects, node, parsed_doc)
+      def map_class_name_objects(class_name_objects, node, parsed_doc, ree_context)
         imported_consts = []
         not_imported_consts = []
 
@@ -128,6 +128,7 @@ module RubyLsp
                 detail: entry_comment + " #{file_name}"
               )
 
+              addition_edits = ree_context.is_link_object? ? [] : ConstAdditionalTextEditsCreator.call(parsed_doc, class_name, package_name, entry)
               not_imported_consts << Interface::CompletionItem.new(
                 label: class_name,
                 label_details: label_details,
@@ -137,7 +138,7 @@ module RubyLsp
                   new_text: class_name,
                 ),
                 kind: Constant::CompletionItemKind::CLASS,
-                additional_text_edits: ConstAdditionalTextEditsCreator.call(parsed_doc, class_name, package_name, entry)
+                additional_text_edits: addition_edits
               )
             end
           end

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

@@ -36,7 +36,7 @@ module RubyLsp
           link_group.map{ renderer.render(_1) }.join('')
         end
 
-        editor.insert_link_block(parsed_doc, link_groups_texts.select{ _1.size > 0 }.join("\n"))
+        editor.insert_link_block(parsed_doc, link_groups_texts.select{ _1.size > 0 }.join(''))
         editor.source
       end
     end

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/handlers/completion_handler.rb

@@ -1,6 +1,7 @@
 require_relative "../utils/ree_lsp_utils"
 require_relative "../ree_object_finder"
 require_relative '../completion/completion_items_mapper'
+require_relative "../ree_context"
 
 module RubyLsp
   module Ree
@@ -18,6 +19,7 @@ module RubyLsp
         @root_node = @node_context.instance_variable_get(:@nesting_nodes).first
         @finder = ReeObjectFinder.new(@index)
         @mapper = RubyLsp::Ree::CompletionItemsMapper.new(@index)
+        @ree_context = RubyLsp::Ree::ReeContext.new(node_context)
       end
 
       def get_ree_receiver(receiver_node)
@@ -65,7 +67,7 @@ module RubyLsp
 
         parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_ast(@root_node, @uri)
 
-        @mapper.map_class_name_objects(class_name_objects.take(CANDIDATES_LIMIT), node, parsed_doc)
+        @mapper.map_class_name_objects(class_name_objects.take(CANDIDATES_LIMIT), node, parsed_doc,  @ree_context)
       end
 
       def get_ree_objects_completions_items(node)

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

@@ -48,7 +48,7 @@ module RubyLsp
 
               uri = File.join(Dir.pwd, path)
             elsif link_node.import_link_type?
-              class_candidates = @finder.search_classes(node.name.to_s)
+              class_candidates = @finder.find_classes(node.name.to_s)
               next unless class_candidates
 
               class_candidates = class_candidates.flatten
@@ -271,7 +271,7 @@ module RubyLsp
 
       def find_object_uri_for_package(link_node, package_name)
         if link_node.import_link_type?
-          class_candidates = @finder.search_classes(link_node.imports.first)
+          class_candidates = @finder.find_classes(link_node.imports.first)
           return nil unless class_candidates
 
           class_candidates = class_candidates.flatten

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)
@@ -61,6 +61,14 @@ class RubyLsp::Ree::BodyObjectsParser < RubyLsp::Ree::BasicParser
           target_objects += parse(node.elements)
         end
 
+        if node.respond_to?(:conditions)
+          target_objects += parse(node.conditions)
+        end
+
+        if node.respond_to?(:expression)
+          target_objects += parse([node.expression])
+        end
+        
         if node.respond_to?(:predicate)
           target_objects += parse([node.predicate])
         end

data/lib/ruby_lsp/ruby_lsp_ree/ree_object_finder.rb

@@ -49,6 +49,13 @@ module RubyLsp
         @index.instance_variable_get(:@entries).values_at(*keys)
       end
 
+      def find_classes(name)
+        keys = @index
+          .names
+          .select{ _1.split('::').last == name}
+        @index.instance_variable_get(:@entries).values_at(*keys)
+      end
+      
       def find_object(name)
         objects_by_name = @index[name]
         return unless objects_by_name

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.24"
+    VERSION = "0.1.26"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Ruslan Gatiyatov
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-06-27 00:00:00.000000000 Z
+date: 2026-02-09 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
@@ -102,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby LSP addon for Ree framework.
 test_files: []