rucoa 0.11.0 → 0.12.0

data/lib/rucoa/handlers/initialized_handler.rb

@@ -13,18 +13,14 @@ module Rucoa
 
       private
 
-      # @return [void]
-      def update_definition_store
-        sources.each do |source|
-          definition_store.update_from(source)
-        end
+      # @return [String]
+      def glob
+        ::File.expand_path('{app,lib}/**/*.rb')
       end
 
-      # @return [void]
-      def update_source_store
-        sources.each do |source|
-          source_store.update(source)
-        end
+      # @return [Array<Pathname>]
+      def pathnames
+        ::Pathname.glob(glob)
       end
 
       # @return [Array<Rucoa::Source>]
@@ -37,14 +33,18 @@ module Rucoa
         end
       end
 
-      # @return [Array<Pathname>]
-      def pathnames
-        ::Pathname.glob(glob)
+      # @return [void]
+      def update_definition_store
+        sources.each do |source|
+          definition_store.update_from(source)
+        end
       end
 
-      # @return [String]
-      def glob
-        ::File.expand_path('{app,lib}/**/*.rb')
+      # @return [void]
+      def update_source_store
+        sources.each do |source|
+          source_store.update(source)
+        end
       end
     end
   end

data/lib/rucoa/handlers/text_document_code_action_handler.rb

@@ -59,6 +59,16 @@ module Rucoa
 
         private
 
+        # @return [String]
+        def cop_name
+          @diagnostic.dig('data', 'cop_name')
+        end
+
+        # @return [Array]
+        def diagnostics
+          [@diagnostic]
+        end
+
         # @return [Hash]
         def edit
           {
@@ -75,13 +85,8 @@ module Rucoa
         end
 
         # @return [String]
-        def cop_name
-          @diagnostic.dig('data', 'cop_name')
-        end
-
-        # @return [Array]
-        def diagnostics
-          [@diagnostic]
+        def kind
+          'quickfix'
         end
 
         # @return [Boolean]
@@ -89,11 +94,6 @@ module Rucoa
           true
         end
 
-        # @return [String]
-        def kind
-          'quickfix'
-        end
-
         # @return [String]
         def title
           "Autocorrect #{cop_name}"

data/lib/rucoa/handlers/text_document_completion_handler.rb

@@ -3,6 +3,9 @@
 module Rucoa
   module Handlers
     class TextDocumentCompletionHandler < Base
+      include HandlerConcerns::TextDocumentPositionParameters
+      include HandlerConcerns::TextDocumentUriParameters
+
       COMPLETION_ITEM_KIND_FOR_TEXT = 1
       COMPLETION_ITEM_KIND_FOR_METHOD = 2
       COMPLETION_ITEM_KIND_FOR_FUNCTION = 3
@@ -38,6 +41,42 @@ module Rucoa
 
       private
 
+      # @return [Array<String>]
+      def callable_method_definitions
+        receiver_types.flat_map do |type|
+          definition_store.instance_method_definitions_of(type)
+        end
+      end
+
+      # @return [Array<String>]
+      def callable_method_names
+        callable_method_definitions.map(&:method_name).uniq
+      end
+
+      # @return [Array<String>]
+      def completable_constant_names
+        referrable_constant_names.select do |constant_name|
+          constant_name.start_with?(completion_head)
+        end.sort
+      end
+
+      # @return [Array<String>]
+      def completable_method_names
+        callable_method_names.select do |method_name|
+          method_name.start_with?(completion_head)
+        end.sort
+      end
+
+      # @return [String] e.g. "SE" to `File::SE|`, "ba" to `foo.ba|`
+      def completion_head
+        @completion_head ||=
+          if @repaired
+            ''
+          else
+            node.name
+          end
+      end
+
       # @return [Array<Hash>, nil]
       def completion_items
         return unless responsible?
@@ -56,37 +95,14 @@ module Rucoa
         end
       end
 
-      # @return [Boolean]
-      def responsible?
-        configuration.enables_completion? &&
-          !source.nil?
-      end
-
-      # @return [Rucoa::Source, nil]
-      def source
-        @source ||= source_store.get(uri)
-      end
-
-      # @return [Rucoa::Position]
-      def position
-        @position ||= Position.from_vscode_position(
-          request.dig('params', 'position')
-        )
-      end
-
-      # @return [String]
-      def uri
-        request.dig('params', 'textDocument', 'uri')
-      end
-
       # @return [Array<Hash>]
-      def completion_items_for_method
-        completable_method_names.map do |method_name|
+      def completion_items_for_constant
+        completable_constant_names.map do |constant_name|
           {
-            kind: COMPLETION_ITEM_KIND_FOR_METHOD,
-            label: method_name,
+            kind: COMPLETION_ITEM_KIND_FOR_CONSTANT,
+            label: constant_name,
             textEdit: {
-              newText: method_name,
+              newText: constant_name,
               range: range.to_vscode_range
             }
           }
@@ -94,72 +110,24 @@ module Rucoa
       end
 
       # @return [Array<Hash>]
-      def completion_items_for_constant
-        completable_constant_names.map do |constant_name|
+      def completion_items_for_method
+        completable_method_names.map do |method_name|
           {
-            kind: COMPLETION_ITEM_KIND_FOR_CONSTANT,
-            label: constant_name,
+            kind: COMPLETION_ITEM_KIND_FOR_METHOD,
+            label: method_name,
             textEdit: {
-              newText: constant_name,
+              newText: method_name,
               range: range.to_vscode_range
             }
           }
         end
       end
 
-      # @return [Array<String>]
-      def completable_constant_names
-        referrable_constant_names.select do |constant_name|
-          constant_name.start_with?(completion_head)
-        end.sort
-      end
-
-      # @return [String] e.g. "SE" to `File::SE|`, "ba" to `foo.ba|`
-      def completion_head
-        @completion_head ||=
-          if @repaired
-            ''
-          else
-            node.name
-          end
-      end
-
-      def referrable_constant_names
-        definition_store.constant_definitions_under(constant_namespace).map(&:name).uniq
-      end
-
       # @return [String] e.g. "Foo::Bar" to `Foo::Bar.baz|`.
       def constant_namespace
         node.each_child_node(:const).map(&:name).reverse.join('::')
       end
 
-      # @return [Array<String>]
-      def completable_method_names
-        callable_method_names.select do |method_name|
-          method_name.start_with?(completion_head)
-        end.sort
-      end
-
-      # @return [Array<String>]
-      def callable_method_names
-        callable_method_definitions.map(&:method_name).uniq
-      end
-
-      # @return [Array<String>]
-      def callable_method_definitions
-        receiver_types.flat_map do |type|
-          definition_store.instance_method_definitions_of(type)
-        end
-      end
-
-      # @return [Array<String>]
-      def receiver_types
-        NodeInspector.new(
-          definition_store: definition_store,
-          node: node
-        ).method_receiver_types
-      end
-
       # @return [Rucoa::Node, nil]
       def node
         @node ||=
@@ -176,9 +144,33 @@ module Rucoa
         source.node_at(position)
       end
 
-      # @return [Rucoa::Node, nil]
-      def repaired_node
-        repaired_source.node_at(position)
+      # @return [Rucoa::Range]
+      def range
+        @range ||=
+          if @repaired
+            position.to_range
+          else
+            Range.from_parser_range(
+              case node
+              when Nodes::SendNode
+                node.location.selector
+              else
+                node.location.expression
+              end
+            )
+          end
+      end
+
+      # @return [Array<String>]
+      def receiver_types
+        NodeInspector.new(
+          definition_store: definition_store,
+          node: node
+        ).method_receiver_types
+      end
+
+      def referrable_constant_names
+        definition_store.constant_definitions_under(constant_namespace).map(&:name).uniq
       end
 
       # @return [void]
@@ -194,6 +186,11 @@ module Rucoa
         )
       end
 
+      # @return [Rucoa::Node, nil]
+      def repaired_node
+        repaired_source.node_at(position)
+      end
+
       # @return [Rucoa::Source]
       def repaired_source
         Source.new(
@@ -202,21 +199,10 @@ module Rucoa
         )
       end
 
-      # @return [Rucoa::Range]
-      def range
-        @range ||=
-          if @repaired
-            position.to_range
-          else
-            Range.from_parser_range(
-              case node
-              when Nodes::SendNode
-                node.location.selector
-              else
-                node.location.expression
-              end
-            )
-          end
+      # @return [Boolean]
+      def responsible?
+        configuration.enables_completion? &&
+          !source.nil?
       end
     end
   end

data/lib/rucoa/handlers/text_document_definition_handler.rb

@@ -3,12 +3,23 @@
 module Rucoa
   module Handlers
     class TextDocumentDefinitionHandler < Base
+      include HandlerConcerns::TextDocumentPositionParameters
+      include HandlerConcerns::TextDocumentUriParameters
+
       def call
         respond(location)
       end
 
       private
 
+      # @return [Rucoa::Definitions::Base, nil]
+      def definition
+        @definition ||= NodeInspector.new(
+          definition_store: definition_store,
+          node: node
+        ).definitions.first
+      end
+
       # @return [Hash, nil]
       def location
         return unless reponsible?
@@ -24,36 +35,6 @@ module Rucoa
         configuration.enables_definition? &&
           !definition&.location.nil?
       end
-
-      # @return [Rucoa::Position]
-      def position
-        Position.from_vscode_position(
-          request.dig('params', 'position')
-        )
-      end
-
-      # @return [String]
-      def uri
-        request.dig('params', 'textDocument', 'uri')
-      end
-
-      # @return [Rucoa::Source, nil]
-      def source
-        source_store.get(uri)
-      end
-
-      # @return [Rucoa::Nodes::Base]
-      def node
-        source&.node_at(position)
-      end
-
-      # @return [Rucoa::Definitions::Base, nil]
-      def definition
-        @definition ||= NodeInspector.new(
-          definition_store: definition_store,
-          node: node
-        ).definitions.first
-      end
     end
   end
 end

data/lib/rucoa/handlers/text_document_did_close_handler.rb

@@ -4,16 +4,10 @@ module Rucoa
   module Handlers
     class TextDocumentDidCloseHandler < Base
       include HandlerConcerns::DiagnosticsPublishable
+      include HandlerConcerns::TextDocumentUriParameters
 
       def call
-        clear_diagnostics_on(uri)
-      end
-
-      private
-
-      # @return [String]
-      def uri
-        request.dig('params', 'textDocument', 'uri')
+        clear_diagnostics_on(parameter_uri)
       end
     end
   end

data/lib/rucoa/handlers/text_document_did_open_handler.rb

@@ -4,11 +4,12 @@ module Rucoa
   module Handlers
     class TextDocumentDidOpenHandler < Base
       include HandlerConcerns::DiagnosticsPublishable
+      include HandlerConcerns::TextDocumentUriParameters
 
       def call
         source_store.update(source)
         definition_store.update_from(source)
-        publish_diagnostics_on(uri)
+        publish_diagnostics_on(parameter_uri)
       end
 
       private
@@ -17,7 +18,7 @@ module Rucoa
       def source
         @source ||= Source.new(
           content: text,
-          uri: uri
+          uri: parameter_uri
         )
       end
 
@@ -25,11 +26,6 @@ module Rucoa
       def text
         request.dig('params', 'textDocument', 'text')
       end
-
-      # @return [String]
-      def uri
-        @uri ||= request.dig('params', 'textDocument', 'uri')
-      end
     end
   end
 end

data/lib/rucoa/handlers/text_document_document_highlight_handler.rb

@@ -0,0 +1,256 @@
+# frozen_string_literal: true
+
+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)
+      end
+
+      private
+
+      # @return [Array<Hash>]
+      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)
+      end
+
+      # @return [Boolean]
+      def reponsible?
+        configuration.enables_highlight?
+      end
+
+      module NodeToRangesMappers
+        class Base
+          class << self
+            # @param node [Rucoa::Nodes::Base]
+            # @return [Array<Parser::Source::Range>]
+            def call(node)
+              new(node).call
+            end
+          end
+
+          # @param node [Rucoa::Nodes::Base]
+          def initialize(node)
+            @node = node
+          end
+
+          # @return [Array<Parser::Source::Range>]
+          def call
+            raise ::NotImplementedError
+          end
+        end
+
+        class AnyMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            case @node
+            when Nodes::BeginNode, Nodes::BlockNode
+              BeginMapper.call(@node)
+            when Nodes::CaseNode
+              CaseMapper.call(@node)
+            when Nodes::ClassNode, Nodes::ModuleNode
+              ModuleMapper.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::IfNode
+              IfMapper.call(@node)
+            when Nodes::SendNode
+              SendMapper.call(@node)
+            when Nodes::UntilNode, Nodes::WhileNode
+              WhileMapper.call(@node)
+            else
+              []
+            end
+          end
+        end
+
+        class BeginMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              range_begin,
+              *ranges_resbody,
+              range_else,
+              range_ensure,
+              range_end
+            ].compact
+          end
+
+          private
+
+          # @return [Parser::Source::Range]
+          def range_begin
+            @node.location.begin
+          end
+
+          # @return [Parser::Source::Range, nil]
+          def range_else
+            return unless rescue_node
+
+            rescue_node.location.else
+          end
+
+          # @return [Parser::Source::Range]
+          def range_end
+            @node.location.end
+          end
+
+          # @return [Parser::Source::Range]
+          def range_ensure
+            return unless @node.ensure
+
+            @node.ensure.location.keyword
+          end
+
+          # @return [Array<Parser::Source::Range>]
+          def ranges_resbody
+            return [] unless rescue_node
+
+            rescue_node.resbodies.map do |resbody|
+              resbody.location.keyword
+            end
+          end
+
+          # @return [Rucoa::Nodes::RescueNode, nil]
+          def rescue_node
+            @rescue_node ||= @node.rescue || @node.ensure&.rescue
+          end
+        end
+
+        class DefMapper < BeginMapper
+          private
+
+          # @return [Parser::Source::Range]
+          def range_begin
+            @node.location.keyword
+          end
+        end
+
+        class CaseMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              @node.location.keyword,
+              *ranges_when,
+              @node.location.else,
+              @node.location.end
+            ].compact
+          end
+
+          private
+
+          # @return [Array<Parser::Source::Range>]
+          def ranges_when
+            @node.whens.map do |when_node|
+              when_node.location.keyword
+            end
+          end
+        end
+
+        class IfMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            return AnyMapper.call(@node.parent) if @node.elsif?
+
+            [
+              @node.location.keyword,
+              *ranges_elsif,
+              @node.location.else,
+              @node.location.end
+            ].compact
+          end
+
+          private
+
+          # @return [Array<Parser::Source::Range>]
+          def ranges_elsif
+            return [] unless @node.elsif
+
+            ElsifMapper.call(@node.elsif)
+          end
+        end
+
+        class ElsifMapper < IfMapper
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              *ranges_elsif,
+              @node.location.else
+            ].compact
+          end
+        end
+
+        class ForMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              @node.location.keyword,
+              @node.location.in,
+              @node.location.end
+            ].compact
+          end
+        end
+
+        class ModuleMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              @node.location.keyword,
+              @node.location.end
+            ]
+          end
+        end
+
+        class SendMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            return [] unless @node.block
+
+            BeginMapper.call(@node.block)
+          end
+        end
+
+        class WhenMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            CaseMapper.call(@node.parent)
+          end
+        end
+
+        class WhileMapper < Base
+          # @return [Array<Parser::Source::Range>]
+          def call
+            [
+              @node.location.keyword,
+              @node.location.end
+            ]
+          end
+        end
+      end
+    end
+  end
+end