ruby-lsp-rake 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8328d935d374570d5da89ecdf66a791f731e5fefb9a10e2c8338c5f22b6fa3
-  data.tar.gz: 86cdb9a4c43c22a7027f284b8e32b0f18c62daa0b9bb8a7f2648b741a7cd0ae6
+  metadata.gz: 5eecc86f8a92c3d2f81d686d722f17d22af64985b63ca6ef2db1ca8fc604d773
+  data.tar.gz: 4f15df1db846b1f43063cffc2a32326ea515073993d3497160a21cd9a7f15571
 SHA512:
-  metadata.gz: 3ea090a9fd5e15947adedc3a70c0baab2847e7857946a91cd25cac24dad3f295a0d637dee8bde10bfd58e4c1a67c9cfa2ddc8f1fdaddc749604651e2178824e4
-  data.tar.gz: 7196a513486c450f53877cca1de1980793aedaa34196f23527dbd999138d634e1ae79bafc82607cb0cc667caa7af228527d79597034653ecb1dca928e1a0ab20
+  metadata.gz: d9d2bf49d58f3f86bbb9c64617f62b4b982c9d39dff124b3d82b2ffdd0647ae6a7ac47d2b7d13cca9bd5179308d64bed8e0c3df07b644990af0573ab2c6a16b9
+  data.tar.gz: 4a8c7bce406a07a7641f98efb9b73ea516cc33bf38278253f2674f3fc68381b101e6572eb32ffb3067935c59470f5bd44b62e4952b32adfb7717079f33ac53e6

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/ruby_lsp_rake/addon.rb

@@ -4,28 +4,56 @@
 require "ruby_lsp/addon"
 require_relative "indexing_enhancement"
 require_relative "hover"
+require_relative "definition"
 
 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", "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
+        ::RubyLsp::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
+
+      sig do
+        override.params(
+          response_builder: ResponseBuilders::CollectionResponseBuilder[T.any(
+            Interface::Location, Interface::LocationLink
+          )],
+          _uri: URI::Generic,
+          node_context: NodeContext,
+          dispatcher: Prism::Dispatcher
+        ).void
+      end
+      def create_definition_listener(response_builder, _uri, node_context, dispatcher)
+        Definition.new(response_builder, node_context, @index, dispatcher)
+      end
     end
   end
 end

data/lib/ruby_lsp/ruby_lsp_rake/definition.rb

@@ -0,0 +1,98 @@
+# typed: true
+# frozen_string_literal: true
+
+module RubyLsp
+  module Rake
+    class Definition # rubocop:disable Style/Documentation
+      extend T::Sig
+      include Requests::Support::Common
+
+      sig do
+        params(
+          response_builder: RubyLsp::ResponseBuilders::CollectionResponseBuilder[T.any(
+            Interface::Location, Interface::LocationLink
+          )],
+          node_context: NodeContext,
+          index: RubyIndexer::Index,
+          dispatcher: Prism::Dispatcher
+        ).void
+      end
+      def initialize(response_builder, node_context, index, dispatcher)
+        @response_builder = response_builder
+        @node_context = node_context
+        @nesting = T.let(node_context.nesting, T::Array[String])
+        @index = index
+
+        dispatcher.register(self, :on_symbol_node_enter, :on_string_node_enter)
+      end
+
+      sig { params(node: Prism::SymbolNode).void }
+      def on_symbol_node_enter(node)
+        handle_prerequisite(node)
+      end
+
+      sig { params(node: Prism::StringNode).void }
+      def on_string_node_enter(node)
+        handle_prerequisite(node)
+      end
+
+      sig { params(node: T.any(Prism::SymbolNode, Prism::StringNode)).void }
+      def handle_prerequisite(node) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        call_node_name = @node_context.call_node&.name
+        return unless call_node_name == :task
+
+        name = case node
+               when Prism::StringNode
+                 node.content
+               when Prism::SymbolNode
+                 node.value
+               end
+
+        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 # rubocop:disable Metrics/BlockNesting
+                        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
+
+        entries = @index[task_name]
+
+        # refer to: https://github.com/Shopify/ruby-lsp-rails/blob/b7791290fb59b06dc99e28a991ee0607e3931a1e/lib/ruby_lsp/ruby_lsp_rails/definition.rb#L141-L152
+        entries.each do |entry|
+          loc = entry.location
+          uri = T.unsafe(URI::Generic).from_path(
+            path: entry.file_path,
+            fragment: "L#{loc.start_line},#{loc.start_column + 1}-#{loc.end_line},#{loc.end_column + 1}"
+          )
+          @response_builder << Interface::Location.new(
+            uri: uri,
+            range: range_from_location(entry.location)
+          )
+        end
+      end
+    end
+  end
+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,15 +22,18 @@ 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
 
-      def handle_prerequisite(node) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      sig { params(node: T.any(Prism::StringNode, Prism::SymbolNode)).void }
+      def handle_prerequisite(node) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         call_node_name = @node_context.call_node&.name
         return unless call_node_name == :task
 
@@ -32,7 +44,7 @@ module RubyLsp
                  node.value
                end
 
-        arg = @node_context.call_node.arguments&.arguments&.first
+        arg = @node_context.call_node&.arguments&.arguments&.first
         case arg
         when Prism::KeywordHashNode
           kh = arg.child_nodes.first
@@ -46,7 +58,7 @@ module RubyLsp
               return unless name == v.value
             when Prism::ArrayNode
               return unless v.elements.find do |node|
-                name == case node
+                name == case node # rubocop:disable Metrics/BlockNesting
                         when Prism::StringNode
                           node.content
                         when Prism::SymbolNode
@@ -65,7 +77,7 @@ module RubyLsp
         # 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,
@@ -75,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

data/lib/ruby_lsp_rake/version.rb

@@ -0,0 +1,8 @@
+# typed: true
+# frozen_string_literal: true
+
+module RubyLsp
+  module Rake
+    VERSION = "0.2.0"
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Koji NAKAMURA
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-14 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
@@ -36,11 +35,11 @@ files:
 - README.md
 - Rakefile
 - img/dependency_task_links_on_hover.png
-- lib/ruby/lsp/rake.rb
-- lib/ruby/lsp/rake/version.rb
 - lib/ruby_lsp/ruby_lsp_rake/addon.rb
+- lib/ruby_lsp/ruby_lsp_rake/definition.rb
 - lib/ruby_lsp/ruby_lsp_rake/hover.rb
 - lib/ruby_lsp/ruby_lsp_rake/indexing_enhancement.rb
+- lib/ruby_lsp_rake/version.rb
 - sig/ruby/lsp/rake.rbs
 - sorbet/config
 - sorbet/rbi/annotations/.gitattributes
@@ -84,7 +83,6 @@ metadata:
   homepage_uri: https://github.com/kozy4324/ruby-lsp-rake
   source_code_uri: https://github.com/kozy4324/ruby-lsp-rake
   changelog_uri: https://github.com/kozy4324/ruby-lsp-rake/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby LSP addon for Rake
 test_files: []

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

@@ -1,10 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-module Ruby
-  module Lsp
-    module Rake
-      VERSION = "0.1.4"
-    end
-  end
-end

data/lib/ruby/lsp/rake.rb

@@ -1,13 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-require_relative "rake/version"
-
-module Ruby
-  module Lsp
-    module Rake
-      class Error < StandardError; end
-      # Your code goes here...
-    end
-  end
-end