rucoa 0.7.0 → 0.9.0

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/position.rb

@@ -39,7 +39,7 @@ module Rucoa
 
     # @param column [Integer] 0-origin column number
     # @param line [Integer] 1-origin line number
-    def initialize(column:, line:)
+    def initialize(column: 0, line: 1)
       @column = column
       @line = line
     end

data/lib/rucoa/rbs/class_definition_mapper.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Rbs
+    class ClassDefinitionMapper
+      class << self
+        # @param declaration [RBS::AST::Declarations::Class]
+        # @return [Rucoa::Definitions::ClassDefinition]
+        def call(declaration:)
+          new(declaration: declaration).call
+        end
+      end
+
+      # @param declaration [RBS::AST::Declarations::Class]
+      def initialize(declaration:)
+        @declaration = declaration
+      end
+
+      # @return [Rucoa::Definitions::ClassDefinition]
+      def call
+        Definitions::ClassDefinition.new(
+          fully_qualified_name: fully_qualified_name,
+          source_path: source_path,
+          super_class_fully_qualified_name: super_class_fully_qualified_name
+        )
+      end
+
+      private
+
+      # @return [String]
+      def fully_qualified_name
+        @declaration.name.to_s.delete_prefix('::')
+      end
+
+      # @return [String]
+      def source_path
+        @declaration.location.name
+      end
+
+      # @return [String, nil]
+      def super_class_fully_qualified_name
+        @declaration.super_class&.name&.to_s&.delete_prefix('::')
+      end
+    end
+  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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Rucoa
+  module Rbs
+    class ModuleDefinitionMapper
+      class << self
+        # @param declaration [RBS::AST::Declarations::Module]
+        # @return [Rucoa::Definitions::ModuleDefinition]
+        def call(declaration:)
+          new(declaration: declaration).call
+        end
+      end
+
+      # @param declaration [RBS::AST::Declarations::Module]
+      def initialize(declaration:)
+        @declaration = declaration
+      end
+
+      # @return [Rucoa::Definitions::ModuleDefinition]
+      def call
+        Definitions::ModuleDefinition.new(
+          fully_qualified_name: fully_qualified_name,
+          source_path: source_path
+        )
+      end
+
+      private
+
+      # @return [String]
+      def fully_qualified_name
+        @declaration.name.to_s.delete_prefix('::')
+      end
+
+      # @return [String]
+      def source_path
+        @declaration.location.name
+      end
+    end
+  end
+end

data/lib/rucoa/rbs/ruby_definitions_loader.rb

@@ -18,13 +18,17 @@ module Rucoa
         declarations.flat_map do |declaration|
           case declaration
           when ::RBS::AST::Declarations::Constant
-            [
-              ConstantDefinitionMapper.call(declaration: declaration)
-            ]
-          when ::RBS::AST::Declarations::Class, ::RBS::AST::Declarations::Module
-            [
-              ConstantDefinitionMapper.call(declaration: declaration)
-            ] +
+            [ConstantDefinitionMapper.call(declaration: declaration)]
+          when ::RBS::AST::Declarations::Class
+            [ClassDefinitionMapper.call(declaration: declaration)] +
+              declaration.members.grep(::RBS::AST::Members::MethodDefinition).map do |method_definition|
+                MethodDefinitionMapper.call(
+                  declaration: declaration,
+                  method_definition: method_definition
+                )
+              end
+          when ::RBS::AST::Declarations::Module
+            [ModuleDefinitionMapper.call(declaration: declaration)] +
               declaration.members.grep(::RBS::AST::Members::MethodDefinition).map do |method_definition|
                 MethodDefinitionMapper.call(
                   declaration: declaration,

data/lib/rucoa/rbs.rb

@@ -2,8 +2,10 @@
 
 module Rucoa
   module Rbs
+    autoload :ClassDefinitionMapper, 'rucoa/rbs/class_definition_mapper'
     autoload :ConstantDefinitionMapper, 'rucoa/rbs/constant_definition_mapper'
     autoload :MethodDefinitionMapper, 'rucoa/rbs/method_definition_mapper'
+    autoload :ModuleDefinitionMapper, 'rucoa/rbs/module_definition_mapper'
     autoload :RubyDefinitionsLoader, 'rucoa/rbs/ruby_definitions_loader'
   end
 end

data/lib/rucoa/rubocop/autocorrector.rb

@@ -32,9 +32,20 @@ module Rucoa
       # @return [String]
       def call
         @options[:stdin] = @source.content
-        run([@source.path || 'untitled'])
+        run([path])
         @options[:stdin]
       end
+
+      private
+
+      # @return [String]
+      def path
+        if @source.untitled?
+          'untitled'
+        else
+          @source.name
+        end
+      end
     end
   end
 end

data/lib/rucoa/rubocop/investigator.rb

@@ -32,7 +32,7 @@ module Rucoa
       # @return [Array<RuboCop::Cop::Offense>]
       def call
         @options[:stdin] = @source.content
-        run([@source.path || 'untitled'])
+        run([path])
         @offenses
       end
 
@@ -45,6 +45,15 @@ module Rucoa
         @offenses = offenses
         super
       end
+
+      # @return [String]
+      def path
+        if @source.untitled?
+          'untitled'
+        else
+          @source.name
+        end
+      end
     end
   end
 end

data/lib/rucoa/server.rb

@@ -13,6 +13,7 @@ module Rucoa
       'shutdown' => Handlers::ShutdownHandler,
       'textDocument/codeAction' => Handlers::TextDocumentCodeActionHandler,
       'textDocument/completion' => Handlers::TextDocumentCompletionHandler,
+      'textDocument/definition' => Handlers::TextDocumentDefinitionHandler,
       'textDocument/didChange' => Handlers::TextDocumentDidChangeHandler,
       'textDocument/didClose' => Handlers::TextDocumentDidCloseHandler,
       'textDocument/didOpen' => Handlers::TextDocumentDidOpenHandler,
@@ -58,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]

data/lib/rucoa/source.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module Rucoa
   class Source
     # @return [String]
@@ -9,8 +11,8 @@ module Rucoa
     attr_reader :uri
 
     # @param content [String]
-    # @param uri [String, nil]
-    def initialize(content:, uri: nil)
+    # @param uri [String]
+    def initialize(content:, uri:)
       @content = content
       @uri = uri
     end
@@ -29,36 +31,41 @@ module Rucoa
     #   )
     #   expect(source.definitions).to match(
     #     [
+    #       a_kind_of(Rucoa::Definitions::ClassDefinition),
     #       a_kind_of(Rucoa::Definitions::MethodDefinition)
     #     ]
     #   )
     def definitions
-      @definitions ||= Yard::DefinitionsLoader.load_string(
-        content: @content,
-        path: path
-      )
+      @definitions ||=
+        if parse_result.failed?
+          []
+        else
+          Yard::DefinitionsLoader.call(
+            associations: parse_result.associations,
+            root_node: parse_result.root_node
+          )
+        end
     end
 
     # @return [String, nil]
-    # @example returns path from given VSCode URI
+    # @example returns path for file URI
     #   source = Rucoa::Source.new(
     #     content: '',
     #     uri: 'file:///path/to/foo.rb'
     #   )
-    #   expect(source.path).to eq('/path/to/foo.rb')
-    # @example returns nil for untitled URI
+    #   expect(source.name).to eq('/path/to/foo.rb')
+    # @example returns opaque for untitled URI
     #   source = Rucoa::Source.new(
     #     content: '',
     #     uri: 'untitled:Untitled-1'
     #   )
-    #   expect(source.path).to be_nil
-    def path
-      return unless @uri
-
-      path = ::URI.parse(@uri).path
-      return unless path
-
-      ::CGI.unescape(path)
+    #   expect(source.name).to eq('Untitled-1')
+    def name
+      if untitled?
+        uri_object.opaque
+      else
+        uri_object.path
+      end
     end
 
     # @param position [Rucoa::Position]
@@ -67,29 +74,45 @@ module Rucoa
       root_and_descendant_nodes.reverse.find do |node|
         node.include_position?(position)
       end
-    rescue ::Parser::SyntaxError
-      nil
     end
 
     # @return [Rucoa::Nodes::Base, nil]
     def root_node
-      @root_node ||= Parser.call(@content)
-    rescue ::Parser::SyntaxError
-      nil
+      parse_result.root_node
+    end
+
+    # @return [Boolean]
+    def failed_to_parse?
+      parse_result.failed?
     end
 
     # @return [Boolean]
-    def syntax_error?
-      root_node.nil?
+    def untitled?
+      uri_object.scheme == 'untitled'
     end
 
     private
 
+    # @return [Rucoa::ParseResult]
+    def parse_result
+      return @parse_result if instance_variable_defined?(:@parse_result)
+
+      @parse_result = Parser.call(
+        path: name,
+        text: @content
+      )
+    end
+
     # @return [Array<Rucoa::Nodes::Base>]
     def root_and_descendant_nodes
       return [] unless root_node
 
       [root_node, *root_node.descendants]
     end
+
+    # @return [URI]
+    def uri_object
+      @uri_object ||= ::URI.parse(@uri)
+    end
   end
 end

data/lib/rucoa/source_store.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'cgi'
-require 'uri'
-
 module Rucoa
   class SourceStore
     def initialize
@@ -26,15 +23,5 @@ module Rucoa
     def each_uri(&block)
       @data.each_key(&block)
     end
-
-    private
-
-    # @param uri [String]
-    # @return [String]
-    def path_from_uri(uri)
-      ::CGI.unescape(
-        ::URI.parse(uri).path || 'untitled'
-      )
-    end
   end
 end

data/lib/rucoa/version.rb

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