Merge pull request #88 from r7kamura/feature/highlight-complex

Fix highlight bug on complex assignment pattern

Author: r7kamura

lib/rucoa/handlers/text_document_document_highlight_handler.rb

@@ -406,10 +406,16 @@ def assignment_node
                     break target if target
                   else
                     target = node.previous_siblings.reverse.find do |sibling|
-                      case sibling
-                      when Nodes::LvasgnNode
-                        sibling.name == @node.name
+                      lvasgn_node = [
+                        sibling,
+                        *sibling.descendants # sendの場合はblockの内部まで踏み込まない等の制限が必要
+                      ].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
@@ -438,10 +444,11 @@ def reference_nodes
             when Nodes::ArgNode
               assignment_node.each_ancestor(:block, :def, :defs).first.body_children
             when Nodes::LvasgnNode
-              [
-                assignment_node,
-                *assignment_node.next_siblings
-              ]
+              (
+                [assignment_node] + assignment_node.ancestors.take_while do |node|
+                  !SCOPE_BOUNDARY_NODE_TYPES.include?(node.type)
+                end
+              ).flat_map(&:next_siblings)
             end.flat_map do |node|
               [
                 node,

lib/rucoa/nodes/base.rb

@@ -19,6 +19,11 @@ def ancestors
         each_ancestor.to_a
       end
 
+      # @return [Array<Rucoa::Nodes::Base>]
+      def child_nodes
+        each_child_node.to_a
+      end
+
       # @return [Array<Rucoa::Nodes::Base>]
       def descendants
         each_descendant.to_a
@@ -149,7 +154,7 @@ def namespace
       def next_siblings
         return [] unless parent
 
-        parent.children[(sibling_index + 1)..]
+        parent.child_nodes[(sibling_index + 1)..]
       end
 
       # @return [Rucoa::Nodes::Base, nil]
@@ -185,7 +190,7 @@ def parent=(node)
       def previous_siblings
         return [] unless parent
 
-        parent.children[0...sibling_index]
+        parent.child_nodes[0...sibling_index]
       end
 
       # @note Override.
@@ -224,7 +229,7 @@ def visit_descendants(
 
       # @return [Integer, nil]
       def sibling_index
-        parent&.children&.index do |child|
+        parent&.child_nodes&.index do |child|
           child.eql?(self)
         end
       end

spec/rucoa/handlers/text_document_document_highlight_handler_spec.rb

@@ -1271,5 +1271,37 @@ def a
         )
       end
     end
+
+    context 'when local variable is referenced with complex assignment' do
+      let(:content) do
+        <<~RUBY
+          if foo
+            a = 1
+          end
+          a
+        RUBY
+      end
+
+      let(:position) do
+        Rucoa::Position.new(
+          column: 0,
+          line: 4
+        )
+      end
+
+      it 'returns highlights' do
+        subject
+        expect(server.responses).to match(
+          [
+            hash_including(
+              'id' => 1,
+              'result' => Array.new(2) do
+                a_kind_of(Hash)
+              end
+            )
+          ]
+        )
+      end
+    end
   end
 end