Merge pull request #84 from r7kamura/feature/modifier

Fix highlight bug on modifier `if`, `unless`, `while`, and `until`

Author: r7kamura

lib/rucoa/handlers/text_document_document_highlight_handler.rb

@@ -175,6 +175,7 @@ class IfMapper < Base
           # @return [Array<Parser::Source::Range>]
           def call
             return AnyMapper.call(@node.parent) if @node.elsif?
+            return [] if @node.modifier?
 
             [
               @node.location.keyword,
@@ -244,6 +245,8 @@ def call
         class WhileMapper < Base
           # @return [Array<Parser::Source::Range>]
           def call
+            return [] if @node.modifier?
+
             [
               @node.location.keyword,
               @node.location.end

lib/rucoa/node_concerns.rb

@@ -3,6 +3,7 @@
 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'
   end

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

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]

lib/rucoa/nodes/until_node.rb

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

lib/rucoa/nodes/while_node.rb

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

spec/rucoa/handlers/text_document_document_highlight_handler_spec.rb

@@ -720,5 +720,59 @@ def foo
         )
       end
     end
+
+    context 'when one-lined if is detected' do
+      let(:content) do
+        <<~RUBY
+          1 if foo
+        RUBY
+      end
+
+      let(:position) do
+        Rucoa::Position.new(
+          column: 2,
+          line: 1
+        )
+      end
+
+      it 'returns empty' do
+        subject
+        expect(server.responses).to match(
+          [
+            hash_including(
+              'id' => 1,
+              'result' => []
+            )
+          ]
+        )
+      end
+    end
+
+    context 'when one-lined while is detected' do
+      let(:content) do
+        <<~RUBY
+          1 while true
+        RUBY
+      end
+
+      let(:position) do
+        Rucoa::Position.new(
+          column: 2,
+          line: 1
+        )
+      end
+
+      it 'returns empty' do
+        subject
+        expect(server.responses).to match(
+          [
+            hash_including(
+              'id' => 1,
+              'result' => []
+            )
+          ]
+        )
+      end
+    end
   end
 end