rucoa 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5097a136a7c60eb420569df3c2c115de4716e4e33c2db0ed14e402aca3b7a09
-  data.tar.gz: '0609d97e8b5167b1c0f1217a517c995f6c0ef13a6aef52f483e5c3cbe850e0c8'
+  metadata.gz: 3829019e74a6fedcb5548ce3630b3c145c12ab40c0df99b63fd9747975f0a71d
+  data.tar.gz: 4cd7373ed7239adeb955caf7c373fe5da6d90ca0d92dc34801d2179db0387bbf
 SHA512:
-  metadata.gz: c793f79584557be25e5584343d56d8ab94d195ddd0eadf32f96e0426e3db3749d0f4a502e9d682d7ed17f5926754bdfba9ea4620e60b323224d5d6a2b5802d12
-  data.tar.gz: 42c2e6927d684f63a541c22b2c3d56404acf126d48d665d4573b7def31c3e11a2ff92ce230441e9d2cfd5ee508174a0bcb1b965ab22d1a38156efeed1c6c1995
+  metadata.gz: a3bbe0f9cb45652ab45706b3afa87853ba3e4d8e33b5894080772a054463bc3828db454da0a0af292982f4de9b8fa18a0353d1cf527e6961455d08c68eeeae63
+  data.tar.gz: 3b23e8f98a5a57a7f236f22ba7e8e606a43f477e789646740a99cdbb30f0bf5adb21779c1ea2e0f828112e32e4dd242eae28fde14120870d8163f0bc1adbc769

data/.rubocop.yml

@@ -8,6 +8,9 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 2.7
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Layout/LineLength:
   Enabled: false
 
@@ -47,6 +50,9 @@ Sevencop/MethodDefinitionArgumentsMultiline:
 Sevencop/MethodDefinitionKeywordArgumentOrdered:
   Enabled: true
 
+Sevencop/RequireOrdered:
+  Enabled: true
+
 Style/Documentation:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rucoa (0.12.0)
+    rucoa (0.13.0)
       parser
       rbs
       rubocop
@@ -54,7 +54,7 @@ GEM
     rubocop-rspec (2.13.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
-    sevencop (0.15.0)
+    sevencop (0.16.0)
       rubocop
     unicode-display_width (2.3.0)
     webrick (1.7.0)

data/README.md

@@ -35,6 +35,12 @@ Run "Format Document" command or enable "Format On Save" in the settings to auto
 
 ![demo](images/document-formatting.gif)
 
+### Highlight
+
+Highlights corresponding keywords.
+
+![demo](images/document-highlight.gif)
+
 ### Selection
 
 Run "Expand Selection" command to select appropriate ranges.
@@ -66,10 +72,6 @@ Provides completion items for constant names and method names.
 
 Provides "Go to Definition" command to jump to the definition.
 
-### Highlight
-
-Highlights corresponding keywords.
-
 ### Hover
 
 Shows documentation for the symbol under the cursor.

data/lib/rucoa/handlers/text_document_document_highlight_handler.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Rucoa
   module Handlers
     class TextDocumentDocumentHighlightHandler < Base
       include HandlerConcerns::TextDocumentPositionParameters
       include HandlerConcerns::TextDocumentUriParameters
 
-      DOCUMENT_HIGHLIGHT_KIND_READ = 2
-      DOCUMENT_HIGHLIGHT_KIND_TEXT = 1
-      DOCUMENT_HIGHLIGHT_KIND_WRITE = 3
-
       # @return [void]
       def call
         respond(document_highlights)
@@ -17,21 +15,11 @@ module Rucoa
 
       private
 
-      # @return [Array<Hash>]
+      # @return [Array]
       def document_highlights
-        parser_ranges.map do |parser_range|
-          {
-            'kind' => DOCUMENT_HIGHLIGHT_KIND_TEXT,
-            'range' => Range.from_parser_range(parser_range).to_vscode_range
-          }
-        end
-      end
-
-      # @return [Array<Parser::Source::Range>]
-      def parser_ranges
         return [] unless reponsible?
 
-        NodeToRangesMappers::AnyMapper.call(node)
+        NodeToHighlightsMappers::AnyMapper.call(node).map(&:to_vscode_highlight)
       end
 
       # @return [Boolean]
@@ -39,11 +27,57 @@ module Rucoa
         configuration.enables_highlight?
       end
 
-      module NodeToRangesMappers
+      module Highlights
+        class Base
+          # @param parser_range [Parser::Source::Range]
+          def initialize(parser_range:)
+            @parser_range = parser_range
+          end
+
+          private
+
+          # @return [Hash]
+          def vscode_range
+            Range.from_parser_range(@parser_range).to_vscode_range
+          end
+        end
+
+        class TextHighlight < Base
+          # @return [Hash]
+          def to_vscode_highlight
+            {
+              kind: 1,
+              range: vscode_range
+            }
+          end
+        end
+
+        class ReadHighlight < Base
+          # @return [Hash]
+          def to_vscode_highlight
+            {
+              kind: 2,
+              range: vscode_range
+            }
+          end
+        end
+
+        class WriteHighlight < Base
+          # @return [Hash]
+          def to_vscode_highlight
+            {
+              kind: 3,
+              range: vscode_range
+            }
+          end
+        end
+      end
+
+      module NodeToHighlightsMappers
         class Base
           class << self
             # @param node [Rucoa::Nodes::Base]
-            # @return [Array<Parser::Source::Range>]
+            # @return [Array]
             def call(node)
               new(node).call
             end
@@ -54,14 +88,14 @@ module Rucoa
             @node = node
           end
 
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             raise ::NotImplementedError
           end
         end
 
         class AnyMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             case @node
             when Nodes::BeginNode, Nodes::BlockNode
@@ -70,14 +104,22 @@ module Rucoa
               CaseMapper.call(@node)
             when Nodes::ClassNode, Nodes::ModuleNode
               ModuleMapper.call(@node)
+            when Nodes::CvarNode, Nodes::CvasgnNode
+              ClassVariableMapper.call(@node)
             when Nodes::DefNode
               DefMapper.call(@node)
             when Nodes::EnsureNode, Nodes::ResbodyNode, Nodes::RescueNode, Nodes::WhenNode
               AnyMapper.call(@node.parent)
             when Nodes::ForNode
               ForMapper.call(@node)
+            when Nodes::GvarNode, Nodes::GvasgnNode
+              GlobalVariableMapper.call(@node)
             when Nodes::IfNode
               IfMapper.call(@node)
+            when Nodes::IvarNode, Nodes::IvasgnNode
+              InstanceVariableMapper.call(@node)
+            when Nodes::ArgNode, Nodes::LvarNode, Nodes::LvasgnNode
+              LocalVariableMapper.call(@node)
             when Nodes::SendNode
               SendMapper.call(@node)
             when Nodes::UntilNode, Nodes::WhileNode
@@ -89,7 +131,7 @@ module Rucoa
         end
 
         class BeginMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             [
               range_begin,
@@ -97,7 +139,9 @@ module Rucoa
               range_else,
               range_ensure,
               range_end
-            ].compact
+            ].compact.map do |parser_range|
+              Highlights::TextHighlight.new(parser_range: parser_range)
+            end
           end
 
           private
@@ -126,7 +170,7 @@ module Rucoa
             @node.ensure.location.keyword
           end
 
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def ranges_resbody
             return [] unless rescue_node
 
@@ -151,19 +195,21 @@ module Rucoa
         end
 
         class CaseMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             [
               @node.location.keyword,
               *ranges_when,
               @node.location.else,
               @node.location.end
-            ].compact
+            ].compact.map do |parser_range|
+              Highlights::TextHighlight.new(parser_range: parser_range)
+            end
           end
 
           private
 
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def ranges_when
             @node.whens.map do |when_node|
               when_node.location.keyword
@@ -172,22 +218,35 @@ module Rucoa
         end
 
         class IfMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             return AnyMapper.call(@node.parent) if @node.elsif?
+            return [] if @node.modifier?
 
             [
-              @node.location.keyword,
-              *ranges_elsif,
-              @node.location.else,
-              @node.location.end
+              highlight_keyword,
+              *highlights_elsif,
+              highlight_else,
+              highlight_end
             ].compact
           end
 
           private
 
-          # @return [Array<Parser::Source::Range>]
-          def ranges_elsif
+          def highlight_else
+            Highlights::TextHighlight.new(parser_range: @node.location.else) if @node.location.else
+          end
+
+          def highlight_end
+            Highlights::TextHighlight.new(parser_range: @node.location.end)
+          end
+
+          def highlight_keyword
+            Highlights::TextHighlight.new(parser_range: @node.location.keyword)
+          end
+
+          # @return [Array]
+          def highlights_elsif
             return [] unless @node.elsif
 
             ElsifMapper.call(@node.elsif)
@@ -195,38 +254,250 @@ module Rucoa
         end
 
         class ElsifMapper < IfMapper
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             [
-              *ranges_elsif,
-              @node.location.else
+              *highlights_elsif,
+              highlight_else
             ].compact
           end
         end
 
         class ForMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             [
               @node.location.keyword,
               @node.location.in,
               @node.location.end
+            ].compact.map do |parser_range|
+              Highlights::TextHighlight.new(parser_range: parser_range)
+            end
+          end
+        end
+
+        class GlobalVariableMapper < Base
+          # @return [Array]
+          def call
+            nodes.map do |node|
+              case node
+              when Nodes::GvarNode
+                Highlights::ReadHighlight
+              when Nodes::GvasgnNode
+                Highlights::WriteHighlight
+              end.new(parser_range: node.location.name)
+            end
+          end
+
+          private
+
+          # @return [Rucoa::Nodes::Base, nil]
+          def global_variable_scopable_node
+            @node.ancestors.last
+          end
+
+          # @return [Enumerable<Rucoa::Nodes::Base>]
+          def nodes
+            return [] unless global_variable_scopable_node
+
+            global_variable_scopable_node.each_descendant_node(:gvar, :gvasgn).select do |node|
+              node.name == @node.name
+            end
+          end
+        end
+
+        class InstanceVariableMapper < Base
+          # @return [Array]
+          def call
+            nodes.map do |node|
+              case node
+              when Nodes::IvarNode
+                Highlights::ReadHighlight
+              when Nodes::IvasgnNode
+                Highlights::WriteHighlight
+              end.new(parser_range: node.location.name)
+            end
+          end
+
+          private
+
+          # @return [Rucoa::Nodes::Base, nil]
+          def instance_variable_scopable_node
+            @instance_variable_scopable_node ||= @node.each_ancestor(:class, :module).first
+          end
+
+          # @todo Stop descendant searching if scope boundary node is found (e.g. class, def, etc.).
+          # @return [Enumerable<Rucoa::Nodes::Base>]
+          def nodes
+            return [] unless instance_variable_scopable_node
+
+            instance_variable_scopable_node.each_descendant_node(:ivar, :ivasgn).select do |node|
+              node.name == @node.name
+            end
+          end
+        end
+
+        class ClassVariableMapper < Base
+          # @return [Array]
+          def call
+            nodes.map do |node|
+              case node
+              when Nodes::CvarNode
+                Highlights::ReadHighlight
+              when Nodes::CvasgnNode
+                Highlights::WriteHighlight
+              end.new(parser_range: node.location.name)
+            end
+          end
+
+          private
+
+          # @return [Rucoa::Nodes::Base, nil]
+          def instance_variable_scopable_node
+            @node.each_ancestor(:class, :module).first
+          end
+
+          # @return [Enumerable<Rucoa::Nodes::Base>]
+          def nodes
+            return [] unless instance_variable_scopable_node
+
+            instance_variable_scopable_node.each_descendant_node(:cvar, :cvasgn).select do |node|
+              node.name == @node.name
+            end
+          end
+        end
+
+        class LocalVariableMapper < Base
+          SCOPE_BOUNDARY_NODE_TYPES = ::Set[
+            :class,
+            :def,
+            :defs,
+            :module,
+          ]
+
+          # @return [Array]
+          def call
+            nodes.map do |node|
+              case node
+              when Nodes::LvarNode
+                Highlights::ReadHighlight
+              when Nodes::ArgNode, Nodes::LvasgnNode
+                Highlights::WriteHighlight
+              end.new(parser_range: node.location.name)
+            end
+          end
+
+          private
+
+          # @return [Rucoa::Nodes::ArgNode, Rucoa::Nodes::LvasgnNode, nil]
+          def assignment_node
+            @assignment_node ||=
+              case @node
+              when Nodes::ArgNode, Nodes::LvasgnNode
+                @node
+              when Nodes::LvarNode
+                (
+                  [@node] + @node.ancestors.take_while do |node|
+                    !SCOPE_BOUNDARY_NODE_TYPES.include?(node.type)
+                  end
+                ).find do |node|
+                  case node
+                  when Nodes::ArgNode, Nodes::LvasgnNode
+                    node.name == @node.name
+                  when Nodes::BlockNode, Nodes::DefNode
+                    target = node.arguments.find do |argument|
+                      argument.name == @node.name
+                    end
+                    break target if target
+                  else
+                    target = node.previous_sibling_nodes.reverse.find do |sibling_node|
+                      lvasgn_node = [
+                        sibling_node,
+                        *sibling_node.descendant_nodes
+                      ].reverse.find do |sibling_or_sibling_descendant|
+                        case sibling_or_sibling_descendant
+                        when Nodes::LvasgnNode
+                          break sibling_or_sibling_descendant if sibling_or_sibling_descendant.name == @node.name
+                        end
+                      end
+                      break lvasgn_node if lvasgn_node
+                    end
+                    break target if target
+                  end
+                end || @node.each_ancestor(:def, :defs).first&.then do |node|
+                  break node.arguments.find do |argument|
+                    argument.name == @node.name
+                  end
+                end
+              end
+          end
+
+          # @return [Enumerable<Rucoa::Nodes::ArgNode, Rucoa::Nodes::LvarNode, Rucoa::Nodes::LvasgnNode>]
+          def nodes
+            [
+              assignment_node,
+              *reference_nodes
             ].compact
           end
+
+          # @return [Enumerable<Rucoa::Nodes::LvarNode>]
+          def reference_nodes
+            return [] unless assignment_node
+
+            case assignment_node
+            when Nodes::ArgNode
+              assignment_node.each_ancestor(:block, :def, :defs).first.body_children
+            when Nodes::LvasgnNode
+              (
+                [assignment_node] + assignment_node.ancestors.take_while do |node|
+                  !SCOPE_BOUNDARY_NODE_TYPES.include?(node.type)
+                end
+              ).flat_map(&:next_sibling_nodes)
+            end.flat_map do |node|
+              [
+                node,
+                *node.descendant_nodes
+              ]
+            end.take_while do |node| # FIXME: flat_map and take_while are not correct solution for shadowing.
+              case node
+              when Nodes::ArgNode, Nodes::LvasgnNode
+                node.equal?(assignment_node) || node.name != assignment_node.name
+              else
+                true
+              end
+            end.select do |node|
+              case node
+              when Nodes::LvarNode
+                node.name == @node.name
+              end
+            end
+          end
+
+          class UnshadowedNodeVisitor
+            def initialize(
+              node:,
+              &block
+            )
+              @block = block
+              @node = node
+            end
+          end
         end
 
         class ModuleMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             [
               @node.location.keyword,
               @node.location.end
-            ]
+            ].map do |parser_range|
+              Highlights::TextHighlight.new(parser_range: parser_range)
+            end
           end
         end
 
         class SendMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             return [] unless @node.block
 
@@ -235,19 +506,23 @@ module Rucoa
         end
 
         class WhenMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
             CaseMapper.call(@node.parent)
           end
         end
 
         class WhileMapper < Base
-          # @return [Array<Parser::Source::Range>]
+          # @return [Array]
           def call
+            return [] if @node.modifier?
+
             [
               @node.location.keyword,
               @node.location.end
-            ]
+            ].map do |parser_range|
+              Highlights::TextHighlight.new(parser_range: parser_range)
+            end
           end
         end
       end

data/lib/rucoa/handlers/text_document_formatting_handler.rb

@@ -38,7 +38,7 @@ module Rucoa
             line: 1
           ),
           Position.new(
-            column: @source.content.lines.last.length,
+            column: @source.content.lines.last&.length || 0,
             line: @source.content.lines.count + 1
           )
         ).to_vscode_range

data/lib/rucoa/node_concerns/modifier.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module NodeConcerns
+    module Modifier
+      # @return [Boolean]
+      # @example returns true on modifier if node
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       1 if true
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 2,
+      #       line: 1
+      #     )
+      #   )
+      #   expect(node).to be_modifier
+      # @example returns false on non-modifier if node
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       if true
+      #         1
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
+      #   expect(node).not_to be_modifier
+      def modifier?
+        location.end.nil?
+      end
+    end
+  end
+end

data/lib/rucoa/node_concerns/variable.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module NodeConcerns
+    module Variable
+      # @return [String]
+      # @example returns variable name
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       foo = 1
+      #       foo
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 0,
+      #       line: 2
+      #     )
+      #   )
+      #   expect(node.name).to eq('foo')
+      def name
+        children[0].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/node_concerns.rb

@@ -3,7 +3,9 @@
 module Rucoa
   module NodeConcerns
     autoload :Body, 'rucoa/node_concerns/body'
+    autoload :Modifier, 'rucoa/node_concerns/modifier'
     autoload :QualifiedName, 'rucoa/node_concerns/qualified_name'
     autoload :Rescue, 'rucoa/node_concerns/rescue'
+    autoload :Variable, 'rucoa/node_concerns/variable'
   end
 end

data/lib/rucoa/nodes/arg_node.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class ArgNode < Base
+      # @return [String]
+      # @example returns variable name
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       def foo(bar)
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 8,
+      #       line: 1
+      #     )
+      #   )
+      #   expect(node.name).to eq('bar')
+      def name
+        children[0].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/args_node.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class ArgsNode < Base
+      include ::Enumerable
+
+      # @note For `Enumerable`.
+      def each(&block)
+        children.each(&block)
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/base.rb

@@ -20,8 +20,13 @@ module Rucoa
       end
 
       # @return [Array<Rucoa::Nodes::Base>]
-      def descendants
-        each_descendant.to_a
+      def child_nodes
+        each_child_node.to_a
+      end
+
+      # @return [Array<Rucoa::Nodes::Base>]
+      def descendant_nodes
+        each_descendant_node.to_a
       end
 
       # @param types [Array<Symbol>]
@@ -53,13 +58,13 @@ module Rucoa
       # @param types [Array<Symbol>]
       # @return [Rucoa::Nodes::Base] if a block is given
       # @return [Enumerator] if no block is given
-      def each_descendant(
+      def each_descendant_node(
         *types,
         &block
       )
         return to_enum(__method__, *types) unless block
 
-        visit_descendants(types, &block)
+        visit_descendant_nodes(types, &block)
         self
       end
 
@@ -126,6 +131,32 @@ module Rucoa
         module_nesting.first || 'Object'
       end
 
+      # @return [Array<Rucoa::Nodes::Base>]
+      # @example returns next siblings
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       def foo
+      #         a
+      #         b
+      #         c
+      #         d
+      #         e
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 2,
+      #       line: 4
+      #     )
+      #   )
+      #   expect(node.next_sibling_nodes.map(&:name)).to eq(%w[d e])
+      def next_sibling_nodes
+        return [] unless parent
+
+        parent.child_nodes[(sibling_node_index + 1)..]
+      end
+
       # @return [Rucoa::Nodes::Base, nil]
       def parent
         @mutable_attributes[:parent]
@@ -136,6 +167,32 @@ module Rucoa
         @mutable_attributes[:parent] = node
       end
 
+      # @return [Array<Rucoa::Nodes::Base>]
+      # @example returns previous siblings
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       def foo
+      #         a
+      #         b
+      #         c
+      #         d
+      #         e
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 2,
+      #       line: 4
+      #     )
+      #   )
+      #   expect(node.previous_sibling_nodes.map(&:name)).to eq(%w[a b])
+      def previous_sibling_nodes
+        return [] unless parent
+
+        parent.child_nodes[0...sibling_node_index]
+      end
+
       # @note Override.
       #   Some nodes change their type depending on the context.
       #   For example, `const` node can be `casgn` node.
@@ -155,21 +212,28 @@ module Rucoa
 
       protected
 
-      # Visit all descendants.
+      # Visit all descendant_nodes.
       # @param types [Array<Symbol>]
       # @return [void]
-      def visit_descendants(
+      def visit_descendant_nodes(
         types,
         &block
       )
         each_child_node do |child|
           yield(child) if types.empty? || types.include?(child.type)
-          child.visit_descendants(types, &block)
+          child.visit_descendant_nodes(types, &block)
         end
       end
 
       private
 
+      # @return [Integer, nil]
+      def sibling_node_index
+        parent&.child_nodes&.index do |child|
+          child.equal?(self)
+        end
+      end
+
       # Visits all ancestors.
       # @param types [Array<Symbol>]
       # @return [void]

data/lib/rucoa/nodes/block_node.rb

@@ -6,6 +6,20 @@ module Rucoa
       include NodeConcerns::Body
       include NodeConcerns::Rescue
 
+      # @return [Array<Rucoa::Nodes::ArgNode>]
+      # @example returns arguments
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       foo do |bar, baz|
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
+      #   expect(node.arguments.map(&:name)).to eq(%w[bar baz])
+      def arguments
+        children[-2]
+      end
+
       # @return [Rucoa::Nodes::SendNode]
       # @example returns send node
       #   node = Rucoa::Source.new(

data/lib/rucoa/nodes/cvar_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class CvarNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/cvasgn_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class CvasgnNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/def_node.rb

@@ -6,6 +6,20 @@ module Rucoa
       include NodeConcerns::Body
       include NodeConcerns::Rescue
 
+      # @return [Array<Rucoa::Nodes::ArgNode>]
+      # @example returns arguments
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       def foo(bar, baz)
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
+      #   expect(node.arguments.map(&:name)).to eq(%w[bar baz])
+      def arguments
+        children[-2]
+      end
+
       # @return [String]
       def method_marker
         if singleton?

data/lib/rucoa/nodes/gvar_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class GvarNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/gvasgn_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class GvasgnNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/if_node.rb

@@ -3,6 +3,8 @@
 module Rucoa
   module Nodes
     class IfNode < Base
+      include NodeConcerns::Modifier
+
       # @return [Rucoa::Nodes::Base, nil]
       def branch_else
         children[2]
@@ -25,7 +27,7 @@ module Rucoa
 
       # @return [Boolean]
       def elsif?
-        parent.is_a?(Nodes::IfNode) && eql?(parent.elsif)
+        parent.is_a?(Nodes::IfNode) && equal?(parent.elsif)
       end
     end
   end

data/lib/rucoa/nodes/ivar_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class IvarNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/ivasgn_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class IvasgnNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/lvar_node.rb

@@ -3,24 +3,7 @@
 module Rucoa
   module Nodes
     class LvarNode < Base
-      # @return [String]
-      # @example returns local variable name
-      #   node = Rucoa::Source.new(
-      #     content: <<~RUBY,
-      #       foo = 1
-      #       foo
-      #     RUBY
-      #     uri: 'file:///path/to/example.rb'
-      #   ).node_at(
-      #     Rucoa::Position.new(
-      #       column: 2,
-      #       line: 2
-      #     )
-      #   )
-      #   expect(node.name).to eq('foo')
-      def name
-        children[0].to_s
-      end
+      include NodeConcerns::Variable
     end
   end
 end

data/lib/rucoa/nodes/lvasgn_node.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class LvasgnNode < Base
+      include NodeConcerns::Variable
+    end
+  end
+end

data/lib/rucoa/nodes/send_node.rb

@@ -97,7 +97,7 @@ module Rucoa
 
       # @return [Boolean]
       def called_with_block?
-        parent.is_a?(Nodes::BlockNode) && eql?(parent.send_node)
+        parent.is_a?(Nodes::BlockNode) && equal?(parent.send_node)
       end
     end
   end

data/lib/rucoa/nodes/until_node.rb

@@ -3,6 +3,7 @@
 module Rucoa
   module Nodes
     class UntilNode < Base
+      include NodeConcerns::Modifier
     end
   end
 end

data/lib/rucoa/nodes/while_node.rb

@@ -3,6 +3,7 @@
 module Rucoa
   module Nodes
     class WhileNode < Base
+      include NodeConcerns::Modifier
     end
   end
 end

data/lib/rucoa/nodes.rb

@@ -2,6 +2,8 @@
 
 module Rucoa
   module Nodes
+    autoload :ArgNode, 'rucoa/nodes/arg_node'
+    autoload :ArgsNode, 'rucoa/nodes/args_node'
     autoload :Base, 'rucoa/nodes/base'
     autoload :BeginNode, 'rucoa/nodes/begin_node'
     autoload :BlockNode, 'rucoa/nodes/block_node'
@@ -10,11 +12,18 @@ module Rucoa
     autoload :CbaseNode, 'rucoa/nodes/cbase_node'
     autoload :ClassNode, 'rucoa/nodes/class_node'
     autoload :ConstNode, 'rucoa/nodes/const_node'
+    autoload :CvarNode, 'rucoa/nodes/cvar_node'
+    autoload :CvasgnNode, 'rucoa/nodes/cvasgn_node'
     autoload :DefNode, 'rucoa/nodes/def_node'
     autoload :EnsureNode, 'rucoa/nodes/ensure_node'
     autoload :ForNode, 'rucoa/nodes/for_node'
+    autoload :GvarNode, 'rucoa/nodes/gvar_node'
+    autoload :GvasgnNode, 'rucoa/nodes/gvasgn_node'
     autoload :IfNode, 'rucoa/nodes/if_node'
+    autoload :IvarNode, 'rucoa/nodes/ivar_node'
+    autoload :IvasgnNode, 'rucoa/nodes/ivasgn_node'
     autoload :LvarNode, 'rucoa/nodes/lvar_node'
+    autoload :LvasgnNode, 'rucoa/nodes/lvasgn_node'
     autoload :ModuleNode, 'rucoa/nodes/module_node'
     autoload :ResbodyNode, 'rucoa/nodes/resbody_node'
     autoload :RescueNode, 'rucoa/nodes/rescue_node'

data/lib/rucoa/parser_builder.rb

@@ -5,6 +5,8 @@ require 'parser/current'
 module Rucoa
   class ParserBuilder < ::Parser::Builders::Default
     NODE_CLASS_BY_TYPE = {
+      arg: Nodes::ArgNode,
+      args: Nodes::ArgsNode,
       begin: Nodes::BeginNode,
       block: Nodes::BlockNode,
       case: Nodes::CaseNode,
@@ -13,13 +15,21 @@ module Rucoa
       class: Nodes::ClassNode,
       const: Nodes::ConstNode,
       csend: Nodes::SendNode,
+      cvar: Nodes::CvarNode,
+      cvasgn: Nodes::CvasgnNode,
       def: Nodes::DefNode,
       defs: Nodes::DefNode,
       ensure: Nodes::EnsureNode,
       for: Nodes::ForNode,
+      gvar: Nodes::GvarNode,
+      gvasgn: Nodes::GvasgnNode,
       if: Nodes::IfNode,
+      ivar: Nodes::IvarNode,
+      ivasgn: Nodes::IvasgnNode,
+      kwarg: Nodes::ArgNode,
       kwbegin: Nodes::BeginNode,
       lvar: Nodes::LvarNode,
+      lvasgn: Nodes::LvasgnNode,
       module: Nodes::ModuleNode,
       resbody: Nodes::ResbodyNode,
       rescue: Nodes::RescueNode,

data/lib/rucoa/source.rb

@@ -122,7 +122,7 @@ module Rucoa
     def root_and_descendant_nodes
       return [] unless root_node
 
-      [root_node, *root_node.descendants]
+      [root_node, *root_node.descendant_nodes]
     end
 
     # @return [URI]

data/lib/rucoa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rucoa
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/lib/rucoa/yard/definitions_loader.rb

@@ -35,7 +35,7 @@ module Rucoa
       def call
         [
           @root_node,
-          *@root_node.descendants
+          *@root_node.descendant_nodes
         ].flat_map do |node|
           [
             DefinitionGenerators::ClassDefinitionGenerator,

data/rucoa.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/releases"
-  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucoa
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -86,6 +86,7 @@ files:
 - exe/rucoa
 - images/diagnostics.gif
 - images/document-formatting.gif
+- images/document-highlight.gif
 - images/document-symbol.gif
 - images/selection-ranges.gif
 - lib/rucoa.rb
@@ -131,10 +132,14 @@ files:
 - lib/rucoa/message_writer.rb
 - lib/rucoa/node_concerns.rb
 - lib/rucoa/node_concerns/body.rb
+- lib/rucoa/node_concerns/modifier.rb
 - lib/rucoa/node_concerns/qualified_name.rb
 - lib/rucoa/node_concerns/rescue.rb
+- lib/rucoa/node_concerns/variable.rb
 - lib/rucoa/node_inspector.rb
 - lib/rucoa/nodes.rb
+- lib/rucoa/nodes/arg_node.rb
+- lib/rucoa/nodes/args_node.rb
 - lib/rucoa/nodes/base.rb
 - lib/rucoa/nodes/begin_node.rb
 - lib/rucoa/nodes/block_node.rb
@@ -143,11 +148,18 @@ files:
 - lib/rucoa/nodes/cbase_node.rb
 - lib/rucoa/nodes/class_node.rb
 - lib/rucoa/nodes/const_node.rb
+- lib/rucoa/nodes/cvar_node.rb
+- lib/rucoa/nodes/cvasgn_node.rb
 - lib/rucoa/nodes/def_node.rb
 - lib/rucoa/nodes/ensure_node.rb
 - lib/rucoa/nodes/for_node.rb
+- lib/rucoa/nodes/gvar_node.rb
+- lib/rucoa/nodes/gvasgn_node.rb
 - lib/rucoa/nodes/if_node.rb
+- lib/rucoa/nodes/ivar_node.rb
+- lib/rucoa/nodes/ivasgn_node.rb
 - lib/rucoa/nodes/lvar_node.rb
+- lib/rucoa/nodes/lvasgn_node.rb
 - lib/rucoa/nodes/module_node.rb
 - lib/rucoa/nodes/resbody_node.rb
 - lib/rucoa/nodes/rescue_node.rb
@@ -199,7 +211,6 @@ metadata:
   homepage_uri: https://github.com/r7kamura/rucoa
   source_code_uri: https://github.com/r7kamura/rucoa
   changelog_uri: https://github.com/r7kamura/rucoa/releases
-  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: