rucoa 0.10.0 → 0.12.0

data/lib/rucoa/nodes/send_node.rb

@@ -21,6 +21,39 @@ module Rucoa
         children[2..]
       end
 
+      # @return [Rucoa::Nodes::BlockNode, nil]
+      # @example returns nil for method call without block
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       foo
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 0,
+      #       line: 1
+      #     )
+      #   )
+      #   expect(node.block).to be_nil
+      # @example returns block
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       foo do
+      #         bar
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/example.rb'
+      #   ).node_at(
+      #     Rucoa::Position.new(
+      #       column: 0,
+      #       line: 1
+      #     )
+      #   )
+      #   expect(node.block).to be_a(Rucoa::Nodes::BlockNode)
+      def block
+        parent if called_with_block?
+      end
+
       # @return [String]
       # @example returns method name
       #   node = Rucoa::Source.new(
@@ -59,6 +92,13 @@ module Rucoa
       def receiver
         children[0]
       end
+
+      private
+
+      # @return [Boolean]
+      def called_with_block?
+        parent.is_a?(Nodes::BlockNode) && eql?(parent.send_node)
+      end
     end
   end
 end

data/lib/rucoa/nodes/until_node.rb

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

data/lib/rucoa/nodes/when_node.rb

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

data/lib/rucoa/nodes/while_node.rb

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

data/lib/rucoa/nodes.rb

@@ -4,17 +4,26 @@ module Rucoa
   module Nodes
     autoload :Base, 'rucoa/nodes/base'
     autoload :BeginNode, 'rucoa/nodes/begin_node'
+    autoload :BlockNode, 'rucoa/nodes/block_node'
+    autoload :CaseNode, 'rucoa/nodes/case_node'
     autoload :CasgnNode, 'rucoa/nodes/casgn_node'
     autoload :CbaseNode, 'rucoa/nodes/cbase_node'
     autoload :ClassNode, 'rucoa/nodes/class_node'
     autoload :ConstNode, 'rucoa/nodes/const_node'
     autoload :DefNode, 'rucoa/nodes/def_node'
-    autoload :DefsNode, 'rucoa/nodes/defs_node'
+    autoload :EnsureNode, 'rucoa/nodes/ensure_node'
+    autoload :ForNode, 'rucoa/nodes/for_node'
+    autoload :IfNode, 'rucoa/nodes/if_node'
     autoload :LvarNode, 'rucoa/nodes/lvar_node'
     autoload :ModuleNode, 'rucoa/nodes/module_node'
+    autoload :ResbodyNode, 'rucoa/nodes/resbody_node'
+    autoload :RescueNode, 'rucoa/nodes/rescue_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'
+    autoload :UntilNode, 'rucoa/nodes/until_node'
+    autoload :WhenNode, 'rucoa/nodes/when_node'
+    autoload :WhileNode, 'rucoa/nodes/while_node'
   end
 end

data/lib/rucoa/parser_builder.rb

@@ -6,18 +6,32 @@ module Rucoa
   class ParserBuilder < ::Parser::Builders::Default
     NODE_CLASS_BY_TYPE = {
       begin: Nodes::BeginNode,
+      block: Nodes::BlockNode,
+      case: Nodes::CaseNode,
       casgn: Nodes::CasgnNode,
       cbase: Nodes::CbaseNode,
       class: Nodes::ClassNode,
       const: Nodes::ConstNode,
+      csend: Nodes::SendNode,
       def: Nodes::DefNode,
-      defs: Nodes::DefsNode,
+      defs: Nodes::DefNode,
+      ensure: Nodes::EnsureNode,
+      for: Nodes::ForNode,
+      if: Nodes::IfNode,
+      kwbegin: Nodes::BeginNode,
       lvar: Nodes::LvarNode,
       module: Nodes::ModuleNode,
+      resbody: Nodes::ResbodyNode,
+      rescue: Nodes::RescueNode,
       sclass: Nodes::SclassNode,
       send: Nodes::SendNode,
       str: Nodes::StrNode,
-      sym: Nodes::SymNode
+      super: Nodes::SendNode,
+      sym: Nodes::SymNode,
+      until: Nodes::UntilNode,
+      when: Nodes::WhenNode,
+      while: Nodes::WhileNode,
+      zsuper: Nodes::SendNode
     }.freeze
 
     class << self

data/lib/rucoa/range.rb

@@ -103,6 +103,12 @@ module Rucoa
     #   )
     #   expect(range).to include(
     #     Rucoa::Position.new(
+    #       column: 1,
+    #       line: 1
+    #     )
+    #   )
+    #   expect(range).to include(
+    #     Rucoa::Position.new(
     #       column: 0,
     #       line: 2
     #     )
@@ -116,9 +122,9 @@ module Rucoa
     def include?(position)
       return false if position.line > @ending.line
       return false if position.line < @beginning.line
-      return false if position.column < @beginning.column
-      return false if position.column > @ending.column
-      return false if position.column == @ending.column && !@including_ending
+      return false if position.line == @beginning.line && position.column < @beginning.column
+      return false if position.line == @ending.line && position.column > @ending.column
+      return false if position.line == @ending.line && position.column == @ending.column && !@including_ending
 
       true
     end

data/lib/rucoa/rbs/class_definition_mapper.rb

@@ -12,6 +12,7 @@ module Rucoa
       def call
         Definitions::ClassDefinition.new(
           description: description,
+          extended_module_qualified_names: extended_module_qualified_names,
           included_module_qualified_names: included_module_qualified_names,
           location: location,
           prepended_module_qualified_names: prepended_module_qualified_names,

data/lib/rucoa/rbs/constant_definition_mapper.rb

@@ -32,15 +32,15 @@ module Rucoa
         @declaration.comment&.string&.sub(/\A\s*<!--.*-->\s*/m, '')
       end
 
-      # @return [String]
-      def qualified_name
-        @declaration.name.to_s.delete_prefix('::')
-      end
-
       # @return [Rucoa::Location]
       def location
         Location.from_rbs_location(@declaration.location)
       end
+
+      # @return [String]
+      def qualified_name
+        @declaration.name.to_s.delete_prefix('::')
+      end
     end
   end
 end

data/lib/rucoa/rbs/method_definition_mapper.rb

@@ -42,23 +42,19 @@ module Rucoa
 
       private
 
-      # @return [Array<Rucoa::Types::MethodType>]
-      def types
-        @method_definition.types.map do |method_type|
-          MethodTypeMapper.call(
-            method_type: method_type
-          )
-        end
-      end
-
       # @return [String, nil]
       def description
         @method_definition.comment&.string&.sub(/\A\s*<!--.*-->\s*/m, '')
       end
 
-      # @return [String]
-      def namespace
-        @declaration.name.to_s.delete_prefix('::')
+      # @return [Symbol]
+      def kind
+        @method_definition.kind
+      end
+
+      # @return [Rucoa::Location]
+      def location
+        Location.from_rbs_location(@method_definition.location)
       end
 
       # @return [String]
@@ -66,14 +62,18 @@ module Rucoa
         @method_definition.name.to_s
       end
 
-      # @return [Symbol]
-      def kind
-        @method_definition.kind
+      # @return [String]
+      def namespace
+        @declaration.name.to_s.delete_prefix('::')
       end
 
-      # @return [Rucoa::Location]
-      def location
-        Location.from_rbs_location(@method_definition.location)
+      # @return [Array<Rucoa::Types::MethodType>]
+      def types
+        @method_definition.types.map do |method_type|
+          MethodTypeMapper.call(
+            method_type: method_type
+          )
+        end
       end
 
       class MethodTypeMapper

data/lib/rucoa/rbs/module_definition_mapper.rb

@@ -20,6 +20,7 @@ module Rucoa
       def call
         Definitions::ModuleDefinition.new(
           description: description,
+          extended_module_qualified_names: extended_module_qualified_names,
           included_module_qualified_names: included_module_qualified_names,
           location: location,
           prepended_module_qualified_names: prepended_module_qualified_names,
@@ -34,9 +35,14 @@ module Rucoa
         @declaration.comment&.string&.sub(/\A\s*<!--.*-->\s*/m, '')
       end
 
-      # @return [String]
-      def qualified_name
-        @declaration.name.to_s.delete_prefix('::')
+      # @return [Array<String>]
+      def extended_module_qualified_names
+        module_qualified_names_for(::RBS::AST::Members::Extend)
+      end
+
+      # @return [Array<String>]
+      def included_module_qualified_names
+        module_qualified_names_for(::RBS::AST::Members::Include)
       end
 
       # @return [Rucoa::Location]
@@ -44,11 +50,10 @@ module Rucoa
         Location.from_rbs_location(@declaration.location)
       end
 
-      # @return [Array<String>]
-      def included_module_qualified_names
+      def module_qualified_names_for(member_class)
         @declaration.members.filter_map do |member|
           case member
-          when ::RBS::AST::Members::Include
+          when member_class
             member.name.to_s.delete_prefix('::')
           end
         end
@@ -56,12 +61,12 @@ module Rucoa
 
       # @return [Array<String>]
       def prepended_module_qualified_names
-        @declaration.members.filter_map do |member|
-          case member
-          when ::RBS::AST::Members::Prepend
-            member.name.to_s.delete_prefix('::')
-          end
-        end
+        module_qualified_names_for(::RBS::AST::Members::Prepend)
+      end
+
+      # @return [String]
+      def qualified_name
+        @declaration.name.to_s.delete_prefix('::')
       end
     end
   end

data/lib/rucoa/rbs/ruby_definitions_loader.rb

@@ -43,11 +43,6 @@ module Rucoa
 
       private
 
-      # @return [Array<RBS::AST::Declarations::Base>]
-      def declarations
-        class_declarations + constant_declarations
-      end
-
       # @return [Array<RBS::AST::Declarations::Class>]
       def class_declarations
         environment.class_decls.values.flat_map do |multi_entry|
@@ -60,6 +55,11 @@ module Rucoa
         environment.constant_decls.values.map(&:decl)
       end
 
+      # @return [Array<RBS::AST::Declarations::Base>]
+      def declarations
+        class_declarations + constant_declarations
+      end
+
       # @return [RBS::Environment]
       def environment
         @environment ||= ::RBS::Environment.from_loader(

data/lib/rucoa/rubocop/configuration_checker.rb

@@ -19,13 +19,6 @@ module Rucoa
 
       private
 
-      # @return [Boolean]
-      def rubocop_configured_for_current_directory?
-        each_current_and_ancestor_pathname.any? do |pathname|
-          pathname.join('.rubocop.yml').exist?
-        end
-      end
-
       # @return [Enumerable<Pathname>]
       def each_current_and_ancestor_pathname
         return to_enum(__method__) unless block_given?
@@ -39,6 +32,13 @@ module Rucoa
         end
         self
       end
+
+      # @return [Boolean]
+      def rubocop_configured_for_current_directory?
+        each_current_and_ancestor_pathname.any? do |pathname|
+          pathname.join('.rubocop.yml').exist?
+        end
+      end
     end
   end
 end

data/lib/rucoa/server.rb

@@ -17,6 +17,7 @@ module Rucoa
       'textDocument/didChange' => Handlers::TextDocumentDidChangeHandler,
       'textDocument/didClose' => Handlers::TextDocumentDidCloseHandler,
       'textDocument/didOpen' => Handlers::TextDocumentDidOpenHandler,
+      'textDocument/documentHighlight' => Handlers::TextDocumentDocumentHighlightHandler,
       'textDocument/documentSymbol' => Handlers::TextDocumentDocumentSymbolHandler,
       'textDocument/formatting' => Handlers::TextDocumentFormattingHandler,
       'textDocument/hover' => Handlers::TextDocumentHoverHandler,
@@ -43,8 +44,8 @@ module Rucoa
     # @param io_in [IO]
     # @param io_out [IO]
     def initialize(
-      io_log: ::StringIO.new,
       io_in: ::StringIO.new,
+      io_log: ::StringIO.new,
       io_out: ::StringIO.new
     )
       @logger = ::Logger.new(io_log)
@@ -62,6 +63,19 @@ module Rucoa
       @definition_store.bulk_add(DefinitionArchiver.load)
     end
 
+    # @return [void]
+    def finish
+      exit(0)
+    end
+
+    # @note This method is for testing.
+    # @return [Array<Hash>]
+    def responses
+      io = @writer.io
+      io.rewind
+      MessageReader.new(io).read.to_a
+    end
+
     # @return [void]
     def start
       @reader.read do |message|
@@ -75,11 +89,6 @@ module Rucoa
       end
     end
 
-    # @return [void]
-    def finish
-      exit(0)
-    end
-
     # @yieldparam response [Hash]
     # @param message [Hash]
     # @return [void]
@@ -94,15 +103,18 @@ module Rucoa
       end
     end
 
-    # @note This method is for testing.
-    # @return [Array<Hash>]
-    def responses
-      io = @writer.io
-      io.rewind
-      MessageReader.new(io).read.to_a
+    private
+
+    # @yieldparam log [String]
+    def debug(&block)
+      @logger.debug(&block) if configuration.enables_debug?
     end
 
-    private
+    # @param request_method [String]
+    # @return [Class, nil]
+    def find_client_request_handler(request_method)
+      METHOD_TO_HANDLER_MAP[request_method]
+    end
 
     # @param request [Hash]
     # @return [void]
@@ -114,11 +126,6 @@ module Rucoa
       end
     end
 
-    # @yieldparam log [String]
-    def debug(&block)
-      @logger.debug(&block) if configuration.enables_debug?
-    end
-
     # @param request [Hash]
     # @return [void]
     def handle_client_request(request)
@@ -134,12 +141,6 @@ module Rucoa
       @client_response_handlers.delete(response['id'])&.call(response)
     end
 
-    # @param request_method [String]
-    # @return [Class, nil]
-    def find_client_request_handler(request_method)
-      METHOD_TO_HANDLER_MAP[request_method]
-    end
-
     # @param message [Hash]
     # @return [void]
     def write_server_request(

data/lib/rucoa/source.rb

@@ -62,6 +62,11 @@ module Rucoa
         end
     end
 
+    # @return [Boolean]
+    def failed_to_parse?
+      parse_result.failed?
+    end
+
     # @return [String, nil]
     # @example returns path for file URI
     #   source = Rucoa::Source.new(
@@ -96,11 +101,6 @@ module Rucoa
       parse_result.root_node
     end
 
-    # @return [Boolean]
-    def failed_to_parse?
-      parse_result.failed?
-    end
-
     # @return [Boolean]
     def untitled?
       uri_object.scheme == 'untitled'

data/lib/rucoa/source_store.rb

@@ -6,10 +6,10 @@ module Rucoa
       @data = {}
     end
 
-    # @param source [Rucoa::Source]
-    # @return [void]
-    def update(source)
-      @data[source.uri] = source
+    # @yieldparam uri [String]
+    # @return [Enumerable<String>]
+    def each_uri(&block)
+      @data.each_key(&block)
     end
 
     # @param uri [String]
@@ -18,10 +18,10 @@ module Rucoa
       @data[uri]
     end
 
-    # @yieldparam uri [String]
-    # @return [Enumerable<String>]
-    def each_uri(&block)
-      @data.each_key(&block)
+    # @param source [Rucoa::Source]
+    # @return [void]
+    def update(source)
+      @data[source.uri] = source
     end
   end
 end

data/lib/rucoa/version.rb

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

data/lib/rucoa/yard/definition_generators/attribute_reader_definition_generator.rb

@@ -35,10 +35,26 @@ module Rucoa
         #       Foo#bar=
         #     ]
         #   )
+        # @example ignores unrecognizable attributes
+        #   definitions = Rucoa::Source.new(
+        #     content: <<~RUBY,
+        #       class Foo
+        #         attr_reader foo
+        #       end
+        #     RUBY
+        #     uri: '/path/to/foo.rb'
+        #   ).definitions
+        #   expect(definitions.map(&:qualified_name)).to eq(
+        #     %w[
+        #       Foo
+        #     ]
+        #   )
         def call
           return [] unless @node.is_a?(Nodes::SendNode) && READER_METHOD_NAMES.include?(@node.name)
 
-          @node.arguments.map do |argument|
+          @node.arguments.filter_map do |argument|
+            next unless argument.respond_to?(:value)
+
             Definitions::MethodDefinition.new(
               description: description,
               kind: :instance,

data/lib/rucoa/yard/definition_generators/attribute_writer_definition_generator.rb

@@ -35,10 +35,26 @@ module Rucoa
         #       Foo#bar=
         #     ]
         #   )
+        # @example ignores unrecognizable attributes
+        #   definitions = Rucoa::Source.new(
+        #     content: <<~RUBY,
+        #       class Foo
+        #         attr_writer foo
+        #       end
+        #     RUBY
+        #     uri: '/path/to/foo.rb'
+        #   ).definitions
+        #   expect(definitions.map(&:qualified_name)).to eq(
+        #     %w[
+        #       Foo
+        #     ]
+        #   )
         def call
           return [] unless @node.is_a?(Nodes::SendNode) && WRITER_METHOD_NAMES.include?(@node.name)
 
-          @node.arguments.map do |argument|
+          @node.arguments.filter_map do |argument|
+            next unless argument.respond_to?(:value)
+
             Definitions::MethodDefinition.new(
               description: description,
               kind: :instance,

data/lib/rucoa/yard/definition_generators/class_definition_generator.rb

@@ -49,6 +49,7 @@ module Rucoa
           [
             Definitions::ClassDefinition.new(
               description: description,
+              extended_module_unqualified_names: extended_module_unqualified_names,
               included_module_unqualified_names: included_module_unqualified_names,
               location: location,
               prepended_module_unqualified_names: prepended_module_unqualified_names,

data/lib/rucoa/yard/definition_generators/method_definition_generator.rb

@@ -22,8 +22,21 @@ module Rucoa
         #     uri: '/path/to/foo.rb'
         #   ).definitions
         #   expect(definitions[0]).to be_a(Rucoa::Definitions::MethodDefinition)
+        # @example returns method definition for another style of singleton def node
+        #   definitions = Rucoa::Source.new(
+        #     content: <<~RUBY,
+        #       class Foo
+        #         class << self
+        #           def bar
+        #           end
+        #         end
+        #       end
+        #     RUBY
+        #     uri: '/path/to/foo.rb'
+        #   ).definitions
+        #   expect(definitions[1].qualified_name).to eq('Foo.bar')
         def call
-          return [] unless @node.is_a?(Nodes::DefNode) || @node.is_a?(Nodes::DefsNode)
+          return [] unless @node.is_a?(Nodes::DefNode)
 
           [
             Definitions::MethodDefinition.new(

data/lib/rucoa/yard/definition_generators/module_definition_generator.rb

@@ -19,6 +19,7 @@ module Rucoa
           [
             Definitions::ModuleDefinition.new(
               description: description,
+              extended_module_unqualified_names: extended_module_unqualified_names,
               included_module_unqualified_names: included_module_unqualified_names,
               location: location,
               prepended_module_unqualified_names: prepended_module_unqualified_names,
@@ -29,6 +30,11 @@ module Rucoa
 
         private
 
+        # @return [Array<Rucoa::UnqualifiedName>]
+        def extended_module_unqualified_names
+          unqualified_names_for('extend')
+        end
+
         # @return [Array<Rucoa::UnqualifiedName>]
         def included_module_unqualified_names
           unqualified_names_for('include')