rucoa 0.3.0 → 0.4.0

data/lib/rucoa/handlers/text_document_selection_range_handler.rb

@@ -4,22 +4,138 @@ module Rucoa
   module Handlers
     class TextDocumentSelectionRangeHandler < Base
       def call
-        return unless configuration.enables_selection_range?
-
-        source = source_store.get(
-          request.dig('params', 'textDocument', 'uri')
-        )
-        return unless source
+        return unless respondable?
 
         respond(
-          request.dig('params', 'positions').filter_map do |position|
+          positions.filter_map do |position|
             SelectionRangeProvider.call(
-              position: Position.from_vscode_position(position),
+              position: position,
               source: source
             )
           end
         )
       end
+
+      private
+
+      # @return [Boolean]
+      def respondable?
+        configuration.enables_selection_range? &&
+          source
+      end
+
+      # @return [Rucoa::Source]
+      def source
+        @source ||= source_store.get(uri)
+      end
+
+      # @return [Array<Rucoa::Position>]
+      def positions
+        request.dig('params', 'positions').map do |position|
+          Position.from_vscode_position(position)
+        end
+      end
+
+      # @return [String]
+      def uri
+        request.dig('params', 'textDocument', 'uri')
+      end
+
+      class SelectionRangeProvider
+        class << self
+          # @param source [Rucoa::Source]
+          # @param position [Rucoa::Position]
+          # @return [Hash, nil]
+          def call(position:, source:)
+            new(
+              position: position,
+              source: source
+            ).call
+          end
+        end
+
+        # @param position [Rucoa::Position]
+        # @param source [Rucoa::Source]
+        def initialize(position:, source:)
+          @position = position
+          @source = source
+        end
+
+        # @return [Hash, nil]
+        def call
+          ranges.reverse.reduce(nil) do |result, range|
+            {
+              parent: result,
+              range: range.to_vscode_range
+            }
+          end
+        end
+
+        private
+
+        # @return [Rucoa::Nodes::Base, nil]
+        def node_at_position
+          if instance_variable_defined?(:@node_at_position)
+            @node_at_position
+          else
+            @node_at_position = @source.node_at(@position)
+          end
+        end
+
+        # @return [Array<Rucoa::Range>]
+        def ranges
+          return [] unless node_at_position
+
+          [node_at_position, *node_at_position.ancestors].flat_map do |node|
+            NodeToRangesMapper.call(node)
+          end
+        end
+
+        class NodeToRangesMapper
+          class << self
+            # @param node [Rucoa::Nodes::Base]
+            # @return [Array<Rucoa::Range>]
+            def call(node)
+              new(node).call
+            end
+          end
+
+          # @param node [Rucoa::Nodes::Base]
+          def initialize(node)
+            @node = node
+          end
+
+          # @return [Array<Rucoa::Range>]
+          def call
+            case @node
+            when Nodes::StrNode
+              [
+                inner_range,
+                expression_range
+              ]
+            else
+              [
+                expression_range
+              ]
+            end
+          end
+
+          private
+
+          # @return [Rucoa::Range]
+          def inner_range
+            Range.new(
+              Position.from_parser_range_ending(@node.location.begin),
+              Position.from_parser_range_beginning(@node.location.end)
+            )
+          end
+
+          # @return [Rucoa::Range]
+          def expression_range
+            Range.from_parser_range(@node.location.expression)
+          end
+        end
+      end
     end
   end
 end

data/lib/rucoa/handlers.rb

@@ -8,6 +8,7 @@ module Rucoa
     autoload :TextDocumentCodeActionHandler, 'rucoa/handlers/text_document_code_action_handler'
     autoload :TextDocumentDidChangeHandler, 'rucoa/handlers/text_document_did_change_handler'
     autoload :TextDocumentDidOpenHandler, 'rucoa/handlers/text_document_did_open_handler'
+    autoload :TextDocumentDocumentSymbolHandler, 'rucoa/handlers/text_document_document_symbol_handler'
     autoload :TextDocumentFormattingHandler, 'rucoa/handlers/text_document_formatting_handler'
     autoload :TextDocumentRangeFormattingHandler, 'rucoa/handlers/text_document_range_formatting_handler'
     autoload :TextDocumentSelectionRangeHandler, 'rucoa/handlers/text_document_selection_range_handler'

data/lib/rucoa/node_concerns/name_full_qualifiable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module NodeConcerns
+    module NameFullQualifiable
+      # @return [String]
+      def full_qualified_name
+        [
+          name,
+          *each_ancestor(:class, :constant, :module).map(&:name)
+        ].reverse.join('::')
+      end
+
+      # @return [String]
+      def name
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/rucoa/node_concerns.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module NodeConcerns
+    autoload :NameFullQualifiable, 'rucoa/node_concerns/name_full_qualifiable'
+  end
+end

data/lib/rucoa/nodes/base.rb

@@ -64,6 +64,19 @@ module Rucoa
         self
       end
 
+      # @note Override.
+      #   Some nodes change their type depending on the context.
+      #   For example, `const` node can be `casgn` node.
+      # @return [Rucoa::Nodes::Base]
+      def updated(type = nil, children = nil, properties = {})
+        properties[:location] ||= @location
+        ParserBuilder.node_class_for(type || @type).new(
+          type || @type,
+          children || @children,
+          properties
+        )
+      end
+
       # @param position [Rucoa::Position]
       # @return [Boolean]
       def include_position?(position)

data/lib/rucoa/nodes/casgn_node.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class CasgnNode < Base
+      include NodeConcerns::NameFullQualifiable
+
+      # @return [String]
+      def name
+        children[1].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/class_node.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class ClassNode < ModuleNode
+    end
+  end
+end

data/lib/rucoa/nodes/const_node.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class ConstNode < Base
+      # @return [String]
+      def name
+        children[1].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/def_node.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class DefNode < Base
+      # @return [String]
+      def name
+        children[0].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/defs_node.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class DefsNode < Base
+      # @return [String]
+      def name
+        children[1].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/module_node.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class ModuleNode < Base
+      include NodeConcerns::NameFullQualifiable
+
+      # @return [String]
+      def name
+        const_node.name
+      end
+
+      private
+
+      # @return [Rucoa::Nodes::ConstNode]
+      def const_node
+        children[0]
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/sclass_node.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class SclassNode < Base
+    end
+  end
+end

data/lib/rucoa/nodes/send_node.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class SendNode < Base
+      # @return [Array<Rucoa::Nodes::Base>]
+      def arguments
+        children[2..]
+      end
+
+      # @return [String]
+      def name
+        children[1].to_s
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/str_node.rb

@@ -3,6 +3,10 @@
 module Rucoa
   module Nodes
     class StrNode < Base
+      # @return [String]
+      def value
+        children[0]
+      end
     end
   end
 end

data/lib/rucoa/nodes/sym_node.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class SymNode < Base
+      # @return [String]
+      def value
+        children[0]
+      end
+    end
+  end
+end

data/lib/rucoa/nodes.rb

@@ -3,6 +3,15 @@
 module Rucoa
   module Nodes
     autoload :Base, 'rucoa/nodes/base'
+    autoload :ClassNode, 'rucoa/nodes/class_node'
+    autoload :CasgnNode, 'rucoa/nodes/casgn_node'
+    autoload :ConstNode, 'rucoa/nodes/const_node'
+    autoload :DefNode, 'rucoa/nodes/def_node'
+    autoload :DefsNode, 'rucoa/nodes/defs_node'
+    autoload :ModuleNode, 'rucoa/nodes/module_node'
+    autoload :SclassNode, 'rucoa/nodes/sclass_node'
+    autoload :SendNode, 'rucoa/nodes/send_node'
     autoload :StrNode, 'rucoa/nodes/str_node'
+    autoload :SymNode, 'rucoa/nodes/sym_node'
   end
 end

data/lib/rucoa/parser_builder.rb

@@ -5,24 +5,33 @@ require 'parser/current'
 module Rucoa
   class ParserBuilder < ::Parser::Builders::Default
     NODE_CLASS_BY_TYPE = {
-      str: Nodes::StrNode
+      casgn: Nodes::CasgnNode,
+      class: Nodes::ClassNode,
+      const: Nodes::ConstNode,
+      def: Nodes::DefNode,
+      defs: Nodes::DefsNode,
+      module: Nodes::ModuleNode,
+      sclass: Nodes::SclassNode,
+      send: Nodes::SendNode,
+      str: Nodes::StrNode,
+      sym: Nodes::SymNode
     }.freeze
 
+    class << self
+      # @param type [Symbol]
+      # @return [Class]
+      def node_class_for(type)
+        NODE_CLASS_BY_TYPE.fetch(type, Nodes::Base)
+      end
+    end
+
     # @note Override.
     def n(type, children, source_map)
-      node_class_for(type).new(
+      self.class.node_class_for(type).new(
         type,
         children,
         location: source_map
       )
     end
-
-    private
-
-    # @param type [Symbol]
-    # @return [Class]
-    def node_class_for(type)
-      NODE_CLASS_BY_TYPE.fetch(type, Nodes::Base)
-    end
   end
 end

data/lib/rucoa/server.rb

@@ -9,6 +9,7 @@ module Rucoa
       'textDocument/codeAction' => Handlers::TextDocumentCodeActionHandler,
       'textDocument/didChange' => Handlers::TextDocumentDidChangeHandler,
       'textDocument/didOpen' => Handlers::TextDocumentDidOpenHandler,
+      'textDocument/documentSymbol' => Handlers::TextDocumentDocumentSymbolHandler,
       'textDocument/formatting' => Handlers::TextDocumentFormattingHandler,
       'textDocument/rangeFormatting' => Handlers::TextDocumentRangeFormattingHandler,
       'textDocument/selectionRange' => Handlers::TextDocumentSelectionRangeHandler,

data/lib/rucoa/source.rb

@@ -23,13 +23,13 @@ module Rucoa
       end
     end
 
-    private
-
     # @return [Rucoa::Nodes::Base, nil]
     def root_node
       @root_node ||= Parser.call(@content)
     end
 
+    private
+
     # @return [Array<Rucoa::Nodes::Base>]
     def root_and_descendant_nodes
       return [] unless root_node

data/lib/rucoa/version.rb

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

data/lib/rucoa.rb

@@ -4,25 +4,21 @@ require_relative 'rucoa/version'
 
 module Rucoa
   autoload :Cli, 'rucoa/cli'
-  autoload :CodeActionProvider, 'rucoa/code_action_provider'
   autoload :Configuration, 'rucoa/configuration'
-  autoload :DiagnosticProvider, 'rucoa/diagnostic_provider'
   autoload :Errors, 'rucoa/errors'
-  autoload :FormattingProvider, 'rucoa/formatting_provider'
   autoload :HandlerConcerns, 'rucoa/handler_concerns'
   autoload :Handlers, 'rucoa/handlers'
   autoload :MessageReader, 'rucoa/message_reader'
   autoload :MessageWriter, 'rucoa/message_writer'
+  autoload :NodeConcerns, 'rucoa/node_concerns'
   autoload :Nodes, 'rucoa/nodes'
   autoload :Parser, 'rucoa/parser'
   autoload :ParserBuilder, 'rucoa/parser_builder'
   autoload :Position, 'rucoa/position'
   autoload :Range, 'rucoa/range'
-  autoload :RangeFormattingProvider, 'rucoa/range_formatting_provider'
   autoload :RubocopAutocorrector, 'rucoa/rubocop_autocorrector'
   autoload :RubocopConfigurationChecker, 'rucoa/rubocop_configuration_checker'
   autoload :RubocopInvestigator, 'rucoa/rubocop_investigator'
-  autoload :SelectionRangeProvider, 'rucoa/selection_range_provider'
   autoload :Server, 'rucoa/server'
   autoload :Source, 'rucoa/source'
   autoload :SourceStore, 'rucoa/source_store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucoa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -57,11 +57,8 @@ files:
 - exe/rucoa
 - lib/rucoa.rb
 - lib/rucoa/cli.rb
-- lib/rucoa/code_action_provider.rb
 - lib/rucoa/configuration.rb
-- lib/rucoa/diagnostic_provider.rb
 - lib/rucoa/errors.rb
-- lib/rucoa/formatting_provider.rb
 - lib/rucoa/handler_concerns.rb
 - lib/rucoa/handler_concerns/configuration_requestable.rb
 - lib/rucoa/handler_concerns/diagnostics_publishable.rb
@@ -72,24 +69,34 @@ files:
 - lib/rucoa/handlers/text_document_code_action_handler.rb
 - lib/rucoa/handlers/text_document_did_change_handler.rb
 - lib/rucoa/handlers/text_document_did_open_handler.rb
+- lib/rucoa/handlers/text_document_document_symbol_handler.rb
 - lib/rucoa/handlers/text_document_formatting_handler.rb
 - lib/rucoa/handlers/text_document_range_formatting_handler.rb
 - lib/rucoa/handlers/text_document_selection_range_handler.rb
 - lib/rucoa/handlers/workspace_did_change_configuration_handler.rb
 - lib/rucoa/message_reader.rb
 - lib/rucoa/message_writer.rb
+- lib/rucoa/node_concerns.rb
+- lib/rucoa/node_concerns/name_full_qualifiable.rb
 - lib/rucoa/nodes.rb
 - lib/rucoa/nodes/base.rb
+- lib/rucoa/nodes/casgn_node.rb
+- lib/rucoa/nodes/class_node.rb
+- lib/rucoa/nodes/const_node.rb
+- lib/rucoa/nodes/def_node.rb
+- lib/rucoa/nodes/defs_node.rb
+- lib/rucoa/nodes/module_node.rb
+- lib/rucoa/nodes/sclass_node.rb
+- lib/rucoa/nodes/send_node.rb
 - lib/rucoa/nodes/str_node.rb
+- lib/rucoa/nodes/sym_node.rb
 - lib/rucoa/parser.rb
 - lib/rucoa/parser_builder.rb
 - lib/rucoa/position.rb
 - lib/rucoa/range.rb
-- lib/rucoa/range_formatting_provider.rb
 - lib/rucoa/rubocop_autocorrector.rb
 - lib/rucoa/rubocop_configuration_checker.rb
 - lib/rucoa/rubocop_investigator.rb
-- lib/rucoa/selection_range_provider.rb
 - lib/rucoa/server.rb
 - lib/rucoa/source.rb
 - lib/rucoa/source_store.rb

data/lib/rucoa/code_action_provider.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-module Rucoa
-  class CodeActionProvider
-    class << self
-      # @param diagnostics [Array<Hash>]
-      # @return [Array<Hash>]
-      def call(diagnostics:)
-        new(diagnostics: diagnostics).call
-      end
-    end
-
-    # @param diagnostics [Array<Hash>]
-    def initialize(diagnostics:)
-      @diagnostics = diagnostics
-    end
-
-    # @return [Array<Hash>]
-    def call
-      correctable_diagnostics.map do |diagnostic|
-        DiagnosticToCodeActionMapper.call(diagnostic)
-      end
-    end
-
-    private
-
-    # @return [Array<Hash>]
-    def correctable_diagnostics
-      @diagnostics.select do |diagnostic|
-        diagnostic.dig('data', 'edits')
-      end
-    end
-
-    class DiagnosticToCodeActionMapper
-      class << self
-        # @param diagnostic [Hash]
-        # @return [Hash]
-        def call(diagnostic)
-          new(diagnostic).call
-        end
-      end
-
-      # @param diagnostic [Hash]
-      def initialize(diagnostic)
-        @diagnostic = diagnostic
-      end
-
-      # @return [Hash]
-      def call
-        {
-          diagnostics: diagnostics,
-          edit: edit,
-          isPreferred: preferred?,
-          kind: kind,
-          title: title
-        }
-      end
-
-      private
-
-      # @return [Hash]
-      def edit
-        {
-          documentChanges: [
-            {
-              edits: @diagnostic.dig('data', 'edits'),
-              textDocument: {
-                uri: @diagnostic.dig('data', 'uri'),
-                version: nil
-              }
-            }
-          ]
-        }
-      end
-
-      # @return [String]
-      def cop_name
-        @diagnostic.dig('data', 'cop_name')
-      end
-
-      # @return [Array]
-      def diagnostics
-        [@diagnostic]
-      end
-
-      # @return [Boolean]
-      def preferred?
-        true
-      end
-
-      # @return [String]
-      def kind
-        'quickfix'
-      end
-
-      # @return [String]
-      def title
-        "Autocorrect #{cop_name}"
-      end
-    end
-  end
-end