rucoa 0.8.0 → 0.9.0

data/lib/rucoa/nodes/base.rb

@@ -89,7 +89,7 @@ module Rucoa
       # @return [String]
       # @example returns namespace
       #   node = Rucoa::Source.new(
-      #     content: <<~RUBY
+      #     content: <<~RUBY,
       #       module Foo
       #         class Bar
       #           def baz
@@ -97,6 +97,7 @@ module Rucoa
       #         end
       #       end
       #     RUBY
+      #     uri: 'file:///path/to/foo/bar.rb'
       #   ).node_at(
       #     Rucoa::Position.new(
       #       column: 4,
@@ -105,14 +106,38 @@ module Rucoa
       #   )
       #   expect(node.namespace).to eq('Foo::Bar')
       # @example returns "Object" when the node is not in a namespace
-      #   node = Rucoa::Parser.call(
-      #     <<~RUBY
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
       #       foo
       #     RUBY
-      #   )
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
       #   expect(node.namespace).to eq('Object')
       def namespace
-        each_ancestor(:module, :class).first&.full_qualified_name || 'Object'
+        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(&:fully_qualified_name)
       end
 
       protected

data/lib/rucoa/nodes/casgn_node.rb

@@ -3,7 +3,7 @@
 module Rucoa
   module Nodes
     class CasgnNode < Base
-      include NodeConcerns::NameFullQualifiable
+      include NodeConcerns::NameFullyQualifiable
 
       # @return [String]
       def name

data/lib/rucoa/nodes/cbase_node.rb

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

data/lib/rucoa/nodes/class_node.rb

@@ -2,7 +2,68 @@
 
 module Rucoa
   module Nodes
-    class ClassNode < ModuleNode
+    class ClassNode < Base
+      include NodeConcerns::NameFullyQualifiable
+
+      # @return [String]
+      def name
+        const_node.name
+      end
+
+      # @return [String, nil]
+      # @example returns nil for class for `class Foo`
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       class Foo
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/foo.rb'
+      #   ).root_node
+      #   expect(node.super_class_chained_name).to be_nil
+      # @example returns "Bar" for class for `class Foo < Bar`
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       class Foo < Bar
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/foo.rb'
+      #   ).root_node
+      #   expect(node.super_class_chained_name).to eq('Bar')
+      # @example returns "Bar::Baz" for class for `class Foo < Bar::Baz`
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       class Foo < Bar::Baz
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/foo.rb'
+      #   ).root_node
+      #   expect(node.super_class_chained_name).to eq('Bar::Baz')
+      # @example returns "::Bar" for class for `class Foo < ::Bar`
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
+      #       class Foo < ::Bar
+      #       end
+      #     RUBY
+      #     uri: 'file:///path/to/foo.rb'
+      #   ).root_node
+      #   expect(node.super_class_chained_name).to eq('::Bar')
+      def super_class_chained_name
+        return unless super_class_node.is_a?(Nodes::ConstNode)
+
+        super_class_node.chained_name
+      end
+
+      private
+
+      # @return [Rucoa::Nodes::ConstNode]
+      def const_node
+        children[0]
+      end
+
+      # @return [Rucoa::Nodes::Base, nil]
+      def super_class_node
+        children[1]
+      end
     end
   end
 end

data/lib/rucoa/nodes/const_node.rb

@@ -5,10 +5,16 @@ module Rucoa
     class ConstNode < Base
       # @return [String]
       # @example returns "A" for "A"
-      #   node = Rucoa::Parser.call('A')
+      #   node = Rucoa::Parser.call(
+      #     path: '/path/to/example.rb',
+      #     text: 'A'
+      #   ).root_node
       #   expect(node.name).to eq('A')
       # @example returns "B" for "A::B"
-      #   node = Rucoa::Parser.call('A::B')
+      #   node = Rucoa::Parser.call(
+      #     path: '/path/to/example.rb',
+      #     text: 'A::B'
+      #   ).root_node
       #   expect(node.name).to eq('B')
       def name
         children[1].to_s
@@ -16,13 +22,25 @@ module Rucoa
 
       # @return [String]
       # @example returns "A" for "A"
-      #   node = Rucoa::Parser.call('A')
+      #   node = Rucoa::Parser.call(
+      #     path: '/path/to/example.rb',
+      #     text: 'A'
+      #   ).root_node
       #   expect(node.chained_name).to eq('A')
       # @example returns "A::B" for "A::B"
-      #   node = Rucoa::Parser.call('A::B')
+      #   node = Rucoa::Parser.call(
+      #     path: '/path/to/example.rb',
+      #     text: 'A::B'
+      #   ).root_node
       #   expect(node.chained_name).to eq('A::B')
       def chained_name
-        if receiver.is_a?(ConstNode)
+        case receiver
+        when Nodes::CbaseNode
+          [
+            '',
+            name
+          ].join('::')
+        when Nodes::ConstNode
           [
             receiver.chained_name,
             name
@@ -32,6 +50,29 @@ module Rucoa
         end
       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(&:fully_qualified_name)
+      end
+
       private
 
       # @return [Rucoa::Nodes::Base, nil]

data/lib/rucoa/nodes/def_node.rb

@@ -6,7 +6,7 @@ module Rucoa
       # @return [String]
       # @example returns method name
       #   node = Rucoa::Source.new(
-      #     content: <<~RUBY
+      #     content: <<~RUBY,
       #       module Foo
       #         class Bar
       #           def baz
@@ -14,6 +14,7 @@ module Rucoa
       #         end
       #       end
       #     RUBY
+      #     uri: 'file:///path/to/foo/bar.rb'
       #   ).node_at(
       #     Rucoa::Position.new(
       #       column: 4,
@@ -28,7 +29,7 @@ module Rucoa
       # @return [String]
       # @example returns full qualified name
       #   node = Rucoa::Source.new(
-      #     content: <<~RUBY
+      #     content: <<~RUBY,
       #       module Foo
       #         class Bar
       #           def baz
@@ -36,14 +37,15 @@ module Rucoa
       #         end
       #       end
       #     RUBY
+      #     uri: 'file:///path/to/foo/bar.rb'
       #   ).node_at(
       #     Rucoa::Position.new(
       #       column: 4,
       #       line: 3
       #     )
       #   )
-      #   expect(node.full_qualified_name).to eq('Foo::Bar#baz')
-      def full_qualified_name
+      #   expect(node.fully_qualified_name).to eq('Foo::Bar#baz')
+      def fully_qualified_name
         [
           namespace,
           method_marker,
@@ -51,6 +53,11 @@ module Rucoa
         ].join
       end
 
+      # @return [Boolean]
+      def singleton?
+        each_ancestor(:sclass).any?
+      end
+
       private
 
       # @return [String]
@@ -61,11 +68,6 @@ module Rucoa
           '#'
         end
       end
-
-      # @return [Boolean]
-      def singleton?
-        each_ancestor(:sclass).any?
-      end
     end
   end
 end

data/lib/rucoa/nodes/defs_node.rb

@@ -3,10 +3,31 @@
 module Rucoa
   module Nodes
     class DefsNode < Base
+      # @return [String]
+      def fully_qualified_name
+        [
+          namespace,
+          method_marker,
+          name
+        ].join
+      end
+
       # @return [String]
       def name
         children[1].to_s
       end
+
+      # @return [Boolean]
+      def singleton?
+        true
+      end
+
+      private
+
+      # @return [String]
+      def method_marker
+        '.'
+      end
     end
   end
 end

data/lib/rucoa/nodes/lvar_node.rb

@@ -6,10 +6,11 @@ module Rucoa
       # @return [String]
       # @example returns local variable name
       #   node = Rucoa::Source.new(
-      #     content: <<~RUBY
+      #     content: <<~RUBY,
       #       foo = 1
       #       foo
       #     RUBY
+      #     uri: 'file:///path/to/example.rb'
       #   ).node_at(
       #     Rucoa::Position.new(
       #       column: 2,

data/lib/rucoa/nodes/module_node.rb

@@ -3,7 +3,7 @@
 module Rucoa
   module Nodes
     class ModuleNode < Base
-      include NodeConcerns::NameFullQualifiable
+      include NodeConcerns::NameFullyQualifiable
 
       # @return [String]
       def name

data/lib/rucoa/nodes/send_node.rb

@@ -5,11 +5,12 @@ module Rucoa
     class SendNode < Base
       # @return [Array<Rucoa::Nodes::Base>]
       # @example returns arguments
-      #   node = Rucoa::Parser.call(
-      #     <<~RUBY
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
       #       foo(bar, baz)
       #     RUBY
-      #   )
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
       #   expect(node.arguments.map(&:name)).to eq(
       #     %w[
       #       bar
@@ -22,11 +23,12 @@ module Rucoa
 
       # @return [String]
       # @example returns method name
-      #   node = Rucoa::Parser.call(
-      #     <<~RUBY
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
       #       foo(bar, baz)
       #     RUBY
-      #   )
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
       #   expect(node.name).to eq('foo')
       def name
         children[1].to_s
@@ -34,17 +36,19 @@ module Rucoa
 
       # @return [Rucoa::Nodes::Base, nil]
       # @example returns nil for receiver-less method call
-      #   node = Rucoa::Parser.call(
-      #     <<~RUBY
+      #   node = Rucoa::Source.new(
+      #     content: <<~RUBY,
       #       foo(bar, baz)
       #     RUBY
-      #   )
+      #     uri: 'file:///path/to/example.rb'
+      #   ).root_node
       #   expect(node.receiver).to be_nil
       # @example returns receiver
       #   node = Rucoa::Source.new(
-      #     content: <<~RUBY
+      #     content: <<~RUBY,
       #       foo.bar
       #     RUBY
+      #     uri: 'file:///path/to/example.rb'
       #   ).node_at(
       #     Rucoa::Position.new(
       #       column: 4,

data/lib/rucoa/nodes.rb

@@ -3,6 +3,7 @@
 module Rucoa
   module Nodes
     autoload :Base, 'rucoa/nodes/base'
+    autoload :CbaseNode, 'rucoa/nodes/cbase_node'
     autoload :ClassNode, 'rucoa/nodes/class_node'
     autoload :CasgnNode, 'rucoa/nodes/casgn_node'
     autoload :ConstNode, 'rucoa/nodes/const_node'

data/lib/rucoa/parse_result.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Rucoa
+  class ParseResult
+    # @return [Array<Parser::Source::Comment>, nil]
+    attr_reader :associations
+
+    # @return [Rucoa::Nodes::Base, nil]
+    attr_reader :root_node
+
+    # @param associations [Array<Parser::Source::Comment>, nil]
+    # @param failed [Boolean]
+    # @param root_node [Rucoa::Nodes::Base, nil]
+    def initialize(
+      associations: nil,
+      failed: false,
+      root_node: nil
+    )
+      @associations = associations
+      @failed = failed
+      @root_node = root_node
+    end
+
+    # @return [Boolean]
+    def failed?
+      @failed
+    end
+  end
+end

data/lib/rucoa/parser.rb

@@ -3,29 +3,61 @@
 require 'parser/current'
 
 module Rucoa
-  # Parses Ruby text code.
   class Parser
     class << self
+      # @param path [String]
       # @param text [String]
-      # @return [Rucoa::Nodes::Base]
-      def call(text)
-        new(text).call
+      # @return [Rucoa::ParseResult]
+      # @example returns non-failed parse result for valid Ruby source
+      #   result = Rucoa::Parser.call(
+      #     path: '/path/to/foo.rb',
+      #     text: 'foo'
+      #   )
+      #   expect(result).not_to be_failed
+      # @example returns failed parse result for invalid Ruby source
+      #   result = Rucoa::Parser.call(
+      #     path: '/path/to/foo.rb',
+      #     text: 'foo('
+      #   )
+      #   expect(result).to be_failed
+      def call(
+        path:,
+        text:
+      )
+        new(
+          path: path,
+          text: text
+        ).call
       end
     end
 
+    # @param path [String]
     # @param text [String]
-    def initialize(text)
+    def initialize(
+      path:,
+      text:
+    )
+      @path = path
       @text = text
     end
 
-    # @return [Rucoa::Nodes::Base]
+    # @return [Rucoa::ParseResult]
     def call
-      parser.parse(
+      root_node, comments = parser.parse_with_comments(
         ::Parser::Source::Buffer.new(
-          '',
+          @path,
           source: @text
         )
       )
+      ParseResult.new(
+        associations: ::Parser::Source::Comment.associate_locations(
+          root_node,
+          comments
+        ),
+        root_node: root_node
+      )
+    rescue ::Parser::SyntaxError
+      ParseResult.new(failed: true)
     end
 
     private

data/lib/rucoa/parser_builder.rb

@@ -6,6 +6,7 @@ module Rucoa
   class ParserBuilder < ::Parser::Builders::Default
     NODE_CLASS_BY_TYPE = {
       casgn: Nodes::CasgnNode,
+      cbase: Nodes::CbaseNode,
       class: Nodes::ClassNode,
       const: Nodes::ConstNode,
       def: Nodes::DefNode,

data/lib/rucoa/rbs/class_definition_mapper.rb

@@ -19,16 +19,16 @@ module Rucoa
       # @return [Rucoa::Definitions::ClassDefinition]
       def call
         Definitions::ClassDefinition.new(
-          full_qualified_name: full_qualified_name,
+          fully_qualified_name: fully_qualified_name,
           source_path: source_path,
-          super_class_name: super_class_name
+          super_class_fully_qualified_name: super_class_fully_qualified_name
         )
       end
 
       private
 
       # @return [String]
-      def full_qualified_name
+      def fully_qualified_name
         @declaration.name.to_s.delete_prefix('::')
       end
 
@@ -38,7 +38,7 @@ module Rucoa
       end
 
       # @return [String, nil]
-      def super_class_name
+      def super_class_fully_qualified_name
         @declaration.super_class&.name&.to_s&.delete_prefix('::')
       end
     end

data/lib/rucoa/rbs/constant_definition_mapper.rb

@@ -19,7 +19,7 @@ module Rucoa
       # @return [Rucoa::Definitions::ConstantDefinition]
       def call
         Definitions::ConstantDefinition.new(
-          full_qualified_name: full_qualified_name,
+          fully_qualified_name: fully_qualified_name,
           source_path: source_path
         )
       end
@@ -27,7 +27,7 @@ module Rucoa
       private
 
       # @return [String]
-      def full_qualified_name
+      def fully_qualified_name
         @declaration.name.to_s.delete_prefix('::')
       end
 

data/lib/rucoa/rbs/module_definition_mapper.rb

@@ -19,7 +19,7 @@ module Rucoa
       # @return [Rucoa::Definitions::ModuleDefinition]
       def call
         Definitions::ModuleDefinition.new(
-          full_qualified_name: full_qualified_name,
+          fully_qualified_name: fully_qualified_name,
           source_path: source_path
         )
       end
@@ -27,7 +27,7 @@ module Rucoa
       private
 
       # @return [String]
-      def full_qualified_name
+      def fully_qualified_name
         @declaration.name.to_s.delete_prefix('::')
       end
 

data/lib/rucoa/rubocop/autocorrector.rb

@@ -40,10 +40,10 @@ module Rucoa
 
       # @return [String]
       def path
-        if @source.untitled? || @source.path.nil?
+        if @source.untitled?
           'untitled'
         else
-          @source.path
+          @source.name
         end
       end
     end

data/lib/rucoa/rubocop/investigator.rb

@@ -48,10 +48,10 @@ module Rucoa
 
       # @return [String]
       def path
-        if @source.untitled? || @source.path.nil?
+        if @source.untitled?
           'untitled'
         else
-          @source.path
+          @source.name
         end
       end
     end

data/lib/rucoa/server.rb

@@ -59,7 +59,7 @@ module Rucoa
       @source_store = SourceStore.new
 
       @definition_store = DefinitionStore.new
-      @definition_store.definitions += DefinitionArchiver.load
+      @definition_store.bulk_add(DefinitionArchiver.load)
     end
 
     # @return [void]