rucoa 0.10.0 → 0.12.0

data/lib/rucoa/handlers/text_document_selection_range_handler.rb

@@ -3,6 +3,8 @@
 module Rucoa
   module Handlers
     class TextDocumentSelectionRangeHandler < Base
+      include HandlerConcerns::TextDocumentUriParameters
+
       def call
         return unless responsible?
 
@@ -18,17 +20,6 @@ module Rucoa
 
       private
 
-      # @return [Boolean]
-      def responsible?
-        configuration.enables_selection_range? &&
-          !source.nil?
-      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|
@@ -36,9 +27,10 @@ module Rucoa
         end
       end
 
-      # @return [String]
-      def uri
-        request.dig('params', 'textDocument', 'uri')
+      # @return [Boolean]
+      def responsible?
+        configuration.enables_selection_range? &&
+          !source.nil?
       end
 
       class SelectionRangeProvider
@@ -128,6 +120,11 @@ module Rucoa
 
           private
 
+          # @return [Rucoa::Range]
+          def expression_range
+            Range.from_parser_range(@node.location.expression)
+          end
+
           # @return [Rucoa::Range]
           def inner_range
             Range.new(
@@ -135,11 +132,6 @@ module Rucoa
               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

data/lib/rucoa/handlers/text_document_signature_help_handler.rb

@@ -3,12 +3,29 @@
 module Rucoa
   module Handlers
     class TextDocumentSignatureHelpHandler < Base
+      include HandlerConcerns::TextDocumentPositionParameters
+      include HandlerConcerns::TextDocumentUriParameters
+
       def call
         respond(signature_help)
       end
 
       private
 
+      # @return [Array<Rucoa::Definitions::MethodDefinition>]
+      def method_definitions
+        NodeInspector.new(
+          definition_store: definition_store,
+          node: node
+        ).method_definitions
+      end
+
+      # @return [Boolean]
+      def responsible?
+        configuration.enables_signature_help? &&
+          node.is_a?(Nodes::SendNode)
+      end
+
       # @return [Hash]
       def signature_help
         return unless responsible?
@@ -18,12 +35,6 @@ module Rucoa
         }
       end
 
-      # @return [Boolean]
-      def responsible?
-        configuration.enables_signature_help? &&
-          node.is_a?(Nodes::SendNode)
-      end
-
       # @return [Array<Hash>]
       def signature_informations
         method_definitions.map do |method_definition|
@@ -33,36 +44,6 @@ module Rucoa
           }
         end
       end
-
-      # @return [Array<Rucoa::Definitions::MethodDefinition>]
-      def method_definitions
-        NodeInspector.new(
-          definition_store: definition_store,
-          node: node
-        ).method_definitions
-      end
-
-      # @return [Rucoa::Nodes::Base, nil]
-      def node
-        @node ||= source.node_at(position)
-      end
-
-      # @return [Rucoa::Position]
-      def position
-        Position.from_vscode_position(
-          request.dig('params', 'position')
-        )
-      end
-
-      # @return [Rucoa::Source]
-      def source
-        source_store.get(uri)
-      end
-
-      # @return [String]
-      def uri
-        request.dig('params', 'textDocument', 'uri')
-      end
     end
   end
 end

data/lib/rucoa/handlers.rb

@@ -13,6 +13,7 @@ module Rucoa
     autoload :TextDocumentDidChangeHandler, 'rucoa/handlers/text_document_did_change_handler'
     autoload :TextDocumentDidCloseHandler, 'rucoa/handlers/text_document_did_close_handler'
     autoload :TextDocumentDidOpenHandler, 'rucoa/handlers/text_document_did_open_handler'
+    autoload :TextDocumentDocumentHighlightHandler, 'rucoa/handlers/text_document_document_highlight_handler'
     autoload :TextDocumentDocumentSymbolHandler, 'rucoa/handlers/text_document_document_symbol_handler'
     autoload :TextDocumentFormattingHandler, 'rucoa/handlers/text_document_formatting_handler'
     autoload :TextDocumentHoverHandler, 'rucoa/handlers/text_document_hover_handler'

data/lib/rucoa/node_concerns/body.rb

@@ -5,7 +5,7 @@ module Rucoa
     module Body
       # @return [Rucoa::Nodes::BeginNode, nil]
       def body
-        children[2]
+        children.last
       end
 
       # @return [Array<Rucoa::Nodes::Base>]

data/lib/rucoa/node_concerns/qualified_name.rb

@@ -3,6 +3,11 @@
 module Rucoa
   module NodeConcerns
     module QualifiedName
+      # @return [String]
+      def name
+        raise NotImplementedError
+      end
+
       # @return [String]
       def qualified_name
         [
@@ -10,11 +15,6 @@ module Rucoa
           *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/rescue.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module NodeConcerns
+    module Rescue
+      # @return [Rucoa::Nodes::EnsureNode, nil]
+      def ensure
+        return unless body.is_a?(Nodes::EnsureNode)
+
+        body
+      end
+
+      # @return [Rucoa::Nodes::RescueNode, nil]
+      def rescue
+        return unless body.is_a?(Nodes::RescueNode)
+
+        body
+      end
+    end
+  end
+end

data/lib/rucoa/node_concerns.rb

@@ -4,5 +4,6 @@ module Rucoa
   module NodeConcerns
     autoload :Body, 'rucoa/node_concerns/body'
     autoload :QualifiedName, 'rucoa/node_concerns/qualified_name'
+    autoload :Rescue, 'rucoa/node_concerns/rescue'
   end
 end

data/lib/rucoa/node_inspector.rb

@@ -51,7 +51,7 @@ module Rucoa
     def return_types
       case @node.type
       when :const
-        ["singleton<#{@node.name}>"]
+        return_types_for_const
       when :lvar
         return_types_for_lvar
       when :send
@@ -103,16 +103,22 @@ module Rucoa
       )
     end
 
-    # @return [Boolean]
-    def singleton_method_call?
-      @node.is_a?(Nodes::ConstNode)
-    end
-
     # @return [String, nil]
     def nearest_def_qualified_name
       @node.each_ancestor(:def).first&.qualified_name
     end
 
+    # @return [Array<String>]
+    def return_types_for_const
+      qualified_name = @definition_store.resolve_constant(
+        UnqualifiedName.new(
+          chained_name: @node.chained_name,
+          module_nesting: @node.module_nesting
+        )
+      )
+      ["singleton<#{qualified_name}>"]
+    end
+
     # @return [Array<String>]
     def return_types_for_lvar
       qualified_name = nearest_def_qualified_name
@@ -136,5 +142,10 @@ module Rucoa
         )&.return_types
       end.compact
     end
+
+    # @return [Boolean]
+    def singleton_method_call?
+      @node.is_a?(Nodes::ConstNode)
+    end
   end
 end

data/lib/rucoa/nodes/base.rb

@@ -14,16 +14,6 @@ module Rucoa
         end
       end
 
-      # @return [Rucoa::Nodes::Base, nil]
-      def parent
-        @mutable_attributes[:parent]
-      end
-
-      # @param node [Rucoa::Nodes::Base]
-      def parent=(node)
-        @mutable_attributes[:parent] = node
-      end
-
       # @return [Array<Rucoa::Nodes::Base>]
       def ancestors
         each_ancestor.to_a
@@ -73,23 +63,6 @@ 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)
@@ -98,6 +71,29 @@ module Rucoa
         Range.from_parser_range(location.expression).include?(position)
       end
 
+      # @return [Array<String>]
+      # @example return ["Bar::Foo", "Foo"] for class Foo::Bar::Baz
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       module Foo
+      #         module Bar
+      #           module Baz
+      #           end
+      #         end
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/foo/bar/baz.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 4,
+      #       line: 3
+      #     )
+      #   )
+      #   expect(node.module_nesting).to eq(['Foo::Bar', 'Foo'])
+      def module_nesting
+        each_ancestor(:class, :module).map(&:qualified_name)
+      end
+
       # @note namespace is a String representation of `Module.nesting`.
       # @return [String]
       # @example returns namespace
@@ -130,27 +126,31 @@ module Rucoa
         module_nesting.first || 'Object'
       end
 
-      # @return [Array<String>]
-      # @example return ["Bar::Foo", "Foo"] for class Foo::Bar::Baz
-      #   node = Rucoa::Source.new(
-      #     content: <<~RUBY,
-      #       module Foo
-      #         module Bar
-      #           module Baz
-      #           end
-      #         end
-      #       end
-      #     RUBY
-      #     uri: 'file:///path/to/foo/bar/baz.rb'
-      #   ).node_at(
-      #     Rucoa::Position.new(
-      #       column: 4,
-      #       line: 3
-      #     )
-      #   )
-      #   expect(node.module_nesting).to eq(['Foo::Bar', 'Foo'])
-      def module_nesting
-        each_ancestor(:class, :module).map(&:qualified_name)
+      # @return [Rucoa::Nodes::Base, nil]
+      def parent
+        @mutable_attributes[:parent]
+      end
+
+      # @param node [Rucoa::Nodes::Base]
+      def parent=(node)
+        @mutable_attributes[:parent] = node
+      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
 
       protected

data/lib/rucoa/nodes/begin_node.rb

@@ -3,6 +3,8 @@
 module Rucoa
   module Nodes
     class BeginNode < Base
+      include NodeConcerns::Body
+      include NodeConcerns::Rescue
     end
   end
 end

data/lib/rucoa/nodes/block_node.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class BlockNode < Base
+      include NodeConcerns::Body
+      include NodeConcerns::Rescue
+
+      # @return [Rucoa::Nodes::SendNode]
+      # @example returns send node
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       foo do
+      #       end
+      #     RUBY
+      #     uri: 'file:///foo.rb'
+      #   ).root_node
+      #   expect(node.send_node.name).to eq('foo')
+      def send_node
+        children[0]
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/case_node.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class CaseNode < Base
+      # @return [Array<Rucoa::Nodes::Base>]
+      # @example returns when nodes
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       case foo
+      #       when 1
+      #       when 2
+      #       else
+      #       end
+      #     RUBY
+      #     uri: 'file:///foo.rb'
+      #   ).root_node
+      #   expect(node.whens.length).to eq(2)
+      def whens
+        children[1...-1]
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/const_node.rb

@@ -3,32 +3,6 @@
 module Rucoa
   module Nodes
     class ConstNode < Base
-      # @return [String]
-      # @example returns "A" for "A"
-      #   node = Rucoa::Source.new(
-      #     content: <<~RUBY,
-      #       A
-      #     RUBY
-      #     uri: 'file:///path/to/a.rb'
-      #   ).root_node
-      #   expect(node.name).to eq('A')
-      # @example returns "B" for "A::B"
-      #   node = Rucoa::Source.new(
-      #     content: <<~RUBY,
-      #       A::B
-      #     RUBY
-      #     uri: 'file:///path/to/a.rb'
-      #   ).node_at(
-      #     Rucoa::Position.new(
-      #       column: 4,
-      #       line: 1
-      #     )
-      #   )
-      #   expect(node.name).to eq('B')
-      def name
-        children[1].to_s
-      end
-
       # @return [String]
       # @example returns "A" for "A"
       #   node = Rucoa::Source.new(
@@ -91,6 +65,32 @@ module Rucoa
         each_ancestor(:class, :module).map(&:qualified_name)
       end
 
+      # @return [String]
+      # @example returns "A" for "A"
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       A
+      #     RUBY
+      #     uri: 'file:///path/to/a.rb'
+      #   ).root_node
+      #   expect(node.name).to eq('A')
+      # @example returns "B" for "A::B"
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       A::B
+      #     RUBY
+      #     uri: 'file:///path/to/a.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 4,
+      #       line: 1
+      #     )
+      #   )
+      #   expect(node.name).to eq('B')
+      def name
+        children[1].to_s
+      end
+
       private
 
       # @return [Rucoa::Nodes::Base, nil]

data/lib/rucoa/nodes/def_node.rb

@@ -3,6 +3,18 @@
 module Rucoa
   module Nodes
     class DefNode < Base
+      include NodeConcerns::Body
+      include NodeConcerns::Rescue
+
+      # @return [String]
+      def method_marker
+        if singleton?
+          '.'
+        else
+          '#'
+        end
+      end
+
       # @return [String]
       # @example returns method name
       #   node = Rucoa::Source.new(
@@ -23,7 +35,7 @@ module Rucoa
       #   )
       #   expect(node.name).to eq('baz')
       def name
-        children[0].to_s
+        children[-3].to_s
       end
 
       # @return [String]
@@ -55,18 +67,7 @@ module Rucoa
 
       # @return [Boolean]
       def singleton?
-        each_ancestor(:sclass).any?
-      end
-
-      private
-
-      # @return [String]
-      def method_marker
-        if singleton?
-          '.'
-        else
-          '#'
-        end
+        type == :defs || each_ancestor(:sclass).any?
       end
     end
   end

data/lib/rucoa/nodes/ensure_node.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class EnsureNode < Base
+      # @return [Rucoa::Nodes::Base, nil]
+      def body
+        children[0]
+      end
+
+      # @return [Rucoa::Nodes::RescueNode, nil]
+      def rescue
+        return unless body.is_a?(Nodes::RescueNode)
+
+        body
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/for_node.rb

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

data/lib/rucoa/nodes/if_node.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class IfNode < Base
+      # @return [Rucoa::Nodes::Base, nil]
+      def branch_else
+        children[2]
+      end
+
+      # @return [Rucoa::Nodes::Base, nil]
+      def branch_if
+        children[1]
+      end
+
+      # @return [Rucoa::Nodes::Base]
+      def condition
+        children[0]
+      end
+
+      # @return [Rucoa::Nodes::IfNode, nil]
+      def elsif
+        branch_else if branch_else.is_a?(Nodes::IfNode)
+      end
+
+      # @return [Boolean]
+      def elsif?
+        parent.is_a?(Nodes::IfNode) && eql?(parent.elsif)
+      end
+    end
+  end
+end

data/lib/rucoa/nodes/resbody_node.rb

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

data/lib/rucoa/nodes/rescue_node.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Nodes
+    class RescueNode < Base
+      # @return [Rucoa::Nodes::Base, nil]
+      def body
+        children[0]
+      end
+
+      # @return [Array<Rucoa::Nodes::Resbody>]
+      def resbodies
+        children[1..-2]
+      end
+    end
+  end
+end