ruby-lsp-rake 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bdcde0bdc4ebc43f2cf72c1644ff98491d779e076beaaa7aa2fbf164dc3d979
-  data.tar.gz: ff5f37d8872ada12e8ffd0cbdc9eef136059d4018551135eda1fe50930d01372
+  metadata.gz: 5cdf5ce3b286b6f1824bcff07f386aff744fee063debf045a33f0a104ccb9a58
+  data.tar.gz: 0f61d107e42ac8412f3f4ac53425c6d8dc0e4c90e11bcab050ee8a1aaa80719c
 SHA512:
-  metadata.gz: 8ca6d230be2bac1c0aba848922adc32307a546d7023f710a103bcd9c040c14ed6fa1062c7a75e2cea8c3ea6285c86b2f19c1c23d8247d2915087322d5eeda833
-  data.tar.gz: 85f04c0bc96f657718961cad0f449751d8d96e13c28a6ae9978df499406f9e8c55e9d45811c1737cf7012fc5855e0201bffcf4fc15cd09aeff67c670180d961c
+  metadata.gz: 44d24d9356c0893323402638a91d564562c66728233445901c32c0502aa6fbfa95ff5ed1cf6b6f94d80031e4f180a2b2b578e96080dd68f9c9c53f14e5b02358
+  data.tar.gz: 98bb06c07335e47d6064101ed3761299215b3f25a5c090006931a257a74e3eb1ba4f5fbf7ad7f916779cafaf49b786fc266756abe14666de1a4140c16a9397f2

data/Rakefile

@@ -17,3 +17,25 @@ namespace :srb do
     sh "bundle exec srb tc"
   end
 end
+
+task aaa: %i[bbb ccc:ddd eee:fff]
+
+task :bbb do
+  puts :bbb
+end
+
+namespace :ccc do
+  task ddd: :eee do
+    puts "ccc:ddd"
+  end
+
+  task :eee do
+    puts "ccc:eee"
+  end
+end
+
+namespace :eee do
+  task :fff do
+    puts "eee:fff"
+  end
+end

data/lib/ruby/lsp/rake/version.rb

@@ -4,7 +4,7 @@
 module Ruby
   module Lsp
     module Rake
-      VERSION = "0.1.3"
+      VERSION = "0.1.5"
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_rake/addon.rb

@@ -8,21 +8,34 @@ require_relative "hover"
 module RubyLsp
   module Rake
     class Addon < ::RubyLsp::Addon # rubocop:disable Style/Documentation
-      def activate(global_state, _message_queue)
+      extend T::Sig
+
+      sig { override.params(global_state: GlobalState, outgoing_queue: Thread::Queue).void }
+      def activate(global_state, outgoing_queue) # rubocop:disable Lint/UnusedMethodArgument
         @index = global_state.index
-        @index.configuration.apply_config({ "included_patterns" => ["**/Rakefile"] })
+        @index.configuration.apply_config({ "included_patterns" => ["**/Rakefile", "lib/../Rakefile"] })
       end
 
+      sig { override.void }
       def deactivate; end
 
+      sig { override.returns(String) }
       def name
         "A Ruby LSP addon that adds extra editor functionality for Rake"
       end
 
+      sig { override.returns(String) }
       def version
         ::Ruby::Lsp::Rake::VERSION
       end
 
+      sig do
+        override.params(
+          response_builder: ResponseBuilders::Hover,
+          node_context: NodeContext,
+          dispatcher: Prism::Dispatcher
+        ).void
+      end
       def create_hover_listener(response_builder, node_context, dispatcher)
         Hover.new(response_builder, node_context, dispatcher, @index)
       end

data/lib/ruby_lsp/ruby_lsp_rake/hover.rb

@@ -4,8 +4,17 @@
 module RubyLsp
   module Rake
     class Hover # rubocop:disable Style/Documentation
+      extend T::Sig
       include Requests::Support::Common
 
+      sig do
+        override.params(
+          response_builder: ResponseBuilders::Hover,
+          node_context: NodeContext,
+          dispatcher: Prism::Dispatcher,
+          index: RubyIndexer::Index
+        ).void
+      end
       def initialize(response_builder, node_context, dispatcher, index)
         @response_builder = response_builder
         @node_context = node_context
@@ -13,14 +22,17 @@ module RubyLsp
         @index = index
       end
 
+      sig { params(node: Prism::StringNode).void }
       def on_string_node_enter(node)
         handle_prerequisite(node)
       end
 
+      sig { params(node: Prism::SymbolNode).void }
       def on_symbol_node_enter(node)
         handle_prerequisite(node)
       end
 
+      sig { params(node: T.any(Prism::StringNode, Prism::SymbolNode)).void }
       def handle_prerequisite(node) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         call_node_name = @node_context.call_node&.name
         return unless call_node_name == :task
@@ -32,13 +44,40 @@ module RubyLsp
                  node.value
                end
 
-        task_name = "task_#{name}"
+        arg = @node_context.call_node&.arguments&.arguments&.first
+        case arg
+        when Prism::KeywordHashNode
+          kh = arg.child_nodes.first
+          case kh
+          when Prism::AssocNode
+            v = kh.value
+            case v
+            when Prism::StringNode
+              return unless name == v.content
+            when Prism::SymbolNode
+              return unless name == v.value
+            when Prism::ArrayNode
+              return unless v.elements.find do |node|
+                name == case node
+                        when Prism::StringNode
+                          node.content
+                        when Prism::SymbolNode
+                          node.value
+                        end
+              end
+            end
+          end
+        else
+          return
+        end
+
+        task_name = "task:#{name}"
         return unless @index.indexed? task_name
 
         # refer to: https://github.com/Shopify/ruby-lsp/blob/896617a0c5f7a22ebe12912a481bf1b59db14c12/lib/ruby_lsp/requests/support/common.rb#L83
         content = +""
         entries = @index[task_name]
-        links = entries.map do |entry|
+        links = entries&.map do |entry|
           loc = entry.location
           uri = T.unsafe(URI::Generic).from_path(
             path: entry.file_path,
@@ -48,7 +87,7 @@ module RubyLsp
           "[#{entry.file_name}](#{uri})"
         end
         @response_builder.push("```\nrake #{name}\n```", category: :title)
-        @response_builder.push("Definitions: #{links.join(" | ")}", category: :links)
+        @response_builder.push("Definitions: #{links&.join(" | ")}", category: :links)
         @response_builder.push(content, category: :documentation)
       end
     end

data/lib/ruby_lsp/ruby_lsp_rake/indexing_enhancement.rb

@@ -4,13 +4,21 @@
 module RubyLsp
   module Rake
     class IndexingEnhancement < RubyIndexer::Enhancement # rubocop:disable Style/Documentation
-      @last_desc = nil
+      extend T::Sig
 
+      sig { params(listener: RubyIndexer::DeclarationListener).void }
+      def initialize(listener)
+        super(listener)
+        @namespace_stack = []
+        @last_desc = nil
+      end
+
+      sig { override.params(node: Prism::CallNode).void }
       def on_call_node_enter(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
         @last_desc = nil unless node.name == :task
 
         return unless @listener.current_owner.nil?
-        return unless node.name == :task || node.name == :desc
+        return unless node.name == :task || node.name == :desc || node.name == :namespace
 
         arguments = node.arguments&.arguments
         return unless arguments
@@ -37,23 +45,36 @@ module RubyLsp
 
         return if name.nil?
 
+        if node.name == :namespace
+          @namespace_stack << name
+          return
+        end
+
         if node.name == :desc
           @last_desc = name
           return
         end
 
-        location = node.location
-        @listener.add_method(
-          "task_#{name}",
-          location,
-          [],
-          comments: @last_desc
-        )
+        ary = [*@namespace_stack, name]
+        (1..(ary.size)).each do |i|
+          @listener.add_method(
+            "task:#{ary[-i..].join(":")}",
+            node.location,
+            [],
+            comments: @last_desc
+          )
+        end
 
         @last_desc = nil
       end
 
-      def on_call_node_leave(node); end
+      sig { override.params(node: Prism::CallNode).void }
+      def on_call_node_leave(node)
+        return unless @listener.current_owner.nil?
+        return unless node.name == :namespace
+
+        @namespace_stack.pop
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Koji NAKAMURA
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp