rucoa 0.10.0 → 0.12.0

data/lib/rucoa/handler_concerns/diagnostics_publishable.rb

@@ -5,17 +5,6 @@ module Rucoa
     module DiagnosticsPublishable
       private
 
-      # @param uri [String]
-      # @return [Array<Hash>]
-      def diagnostics_on(uri)
-        return [] unless configuration.enables_diagnostics?
-
-        DiagnosticProvider.call(
-          source: source_store.get(uri),
-          uri: uri
-        )
-      end
-
       # @param uri [String]
       # @return [void]
       def clear_diagnostics_on(uri)
@@ -28,6 +17,17 @@ module Rucoa
         )
       end
 
+      # @param uri [String]
+      # @return [Array<Hash>]
+      def diagnostics_on(uri)
+        return [] unless configuration.enables_diagnostics?
+
+        DiagnosticProvider.call(
+          source: source_store.get(uri),
+          uri: uri
+        )
+      end
+
       # @param uri [String]
       # @return [void]
       def publish_diagnostics_on(uri)

data/lib/rucoa/handler_concerns/text_document_position_parameters.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module HandlerConcerns
+    module TextDocumentPositionParameters
+      private
+
+      # @return [Rucoa::Nodes::Base, nil]
+      def node
+        return unless position
+        return unless source
+
+        @node ||= source.node_at(position)
+      end
+
+      # @return [String, nil]
+      def parameter_position
+        @parameter_position ||= request.dig('params', 'position')
+      end
+
+      # @return [Rucoa::Position, nil]
+      def position
+        return unless parameter_position
+
+        @position ||= Position.from_vscode_position(parameter_position)
+      end
+    end
+  end
+end

data/lib/rucoa/handler_concerns/text_document_uri_parameters.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module HandlerConcerns
+    module TextDocumentUriParameters
+      private
+
+      # @return [String, nil]
+      def parameter_uri
+        @parameter_uri ||= request.dig('params', 'textDocument', 'uri')
+      end
+
+      # @return [Rucoa::Source, nil]
+      def source
+        return unless parameter_uri
+
+        @source ||= source_store.get(parameter_uri)
+      end
+    end
+  end
+end

data/lib/rucoa/handler_concerns.rb

@@ -4,5 +4,7 @@ module Rucoa
   module HandlerConcerns
     autoload :ConfigurationRequestable, 'rucoa/handler_concerns/configuration_requestable'
     autoload :DiagnosticsPublishable, 'rucoa/handler_concerns/diagnostics_publishable'
+    autoload :TextDocumentPositionParameters, 'rucoa/handler_concerns/text_document_position_parameters'
+    autoload :TextDocumentUriParameters, 'rucoa/handler_concerns/text_document_uri_parameters'
   end
 end

data/lib/rucoa/handlers/base.rb

@@ -41,15 +41,6 @@ module Rucoa
       # @return [Rucoa::Server]
       attr_reader :server
 
-      # @param message [Hash]
-      # @return [void]
-      def respond(message)
-        write(
-          id: request['id'],
-          result: message
-        )
-      end
-
       # @return [Rucoa::Configuration]
       def configuration
         @server.configuration
@@ -60,6 +51,15 @@ module Rucoa
         @server.definition_store
       end
 
+      # @param message [Hash]
+      # @return [void]
+      def respond(message)
+        write(
+          id: request['id'],
+          result: message
+        )
+      end
+
       # @return [Rucoa::SourceStore]
       def source_store
         @server.source_store

data/lib/rucoa/handlers/initialize_handler.rb

@@ -15,6 +15,7 @@ module Rucoa
             },
             definitionProvider: true,
             documentFormattingProvider: true,
+            documentHighlightProvider: true,
             documentRangeFormattingProvider: true,
             documentSymbolProvider: true,
             hoverProvider: true,

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