ruby_mod_kit 0.0.4 → 0.0.5

data/lib/ruby_mod_kit/generation.rb

@@ -18,6 +18,7 @@ module RubyModKit
     # @rbs @errors: Array[Prism::ParseError]
     # @rbs @lines: Array[String]
     # @rbs @offsets: Array[Integer]
+    # @rbs @source: String
 
     attr_reader :script #: String
     attr_reader :memo_pad #: MemoPad
@@ -51,6 +52,7 @@ module RubyModKit
       @errors = parse_result.errors
       @lines = parse_result.source.lines
       @offsets = parse_result.source.offsets
+      @source = @script.dup
       @root_node = Node::ProgramNode.new(parse_result.value)
       init_missions
     end
@@ -78,9 +80,6 @@ module RubyModKit
       else
         perform_corrector
       end
-      @missions.each do |mission|
-        mission.succ(@offset_diff)
-      end
       @memo_pad.succ(@offset_diff)
 
       Generation.new(
@@ -115,18 +114,10 @@ module RubyModKit
       @offset_diff.insert(src_offset, diff)
     end
 
-    # @rbs src_range: Range[Integer]
+    # @rbs src_range: Range[Integer | nil]
     # @rbs return: String
     def [](src_range)
-      dst_range = Range.new(@offset_diff[src_range.first], @offset_diff[src_range.last], src_range.exclude_end?)
-      @script[dst_range] || raise(RubyModKit::Error, "Invalid range")
-    end
-
-    # @rbs offset: Integer
-    # @rbs return: String
-    def line_by_offset(offset)
-      offset = @offset_diff[offset]
-      (@script.match(/.*\n?/, offset) && Regexp.last_match(0)) || raise(RubyModKit::Error)
+      @source[src_range] || raise(RubyModKit::Error, "Invalid range")
     end
 
     # @rbs (Integer) -> String
@@ -146,7 +137,7 @@ module RubyModKit
     # @rbs line_num: Integer
     # @rbs return: String
     def line__overload0(line_num)
-      line_by_offset(@offsets[line_num])
+      @lines[line_num] || raise(RubyModKit::Error)
     end
 
     # @rbs node: Node::BaseNode
@@ -159,29 +150,73 @@ module RubyModKit
     # @rbs return: String
     def line__overload2(parse_error)
       line(parse_error.location.start_line - 1)
+    rescue RubyModKit::Error
+      ""
     end
 
     # @rbs (Integer) -> (Integer | nil)
+    #    | (Node::BaseNode) -> (Integer | nil)
+    #    | (Node::BaseNode, Integer) -> (Integer | nil)
     #    | (Prism::ParseError) -> (Integer | nil)
-    def src_offset(*args)
+    def line_offset(*args)
       case args
       in [Integer]
-        src_offset__overload0(*args)
+        line_offset__overload0(*args)
+      in [Node::BaseNode]
+        line_offset__overload1(*args)
+      in [Node::BaseNode, Integer]
+        line_offset__overload2(*args)
       in [Prism::ParseError]
-        src_offset__overload1(*args)
+        line_offset__overload3(*args)
       end
     end
 
     # @rbs line_num: Integer
     # @rbs return: Integer | nil
-    def src_offset__overload0(line_num)
+    def line_offset__overload0(line_num)
       @offsets[line_num]
     end
 
+    # @rbs node: Node::BaseNode
+    # @rbs return: Integer | nil
+    def line_offset__overload1(node)
+      line_offset(node, 0)
+    end
+
+    # @rbs node: Node::BaseNode
+    # @rbs line_offset: Integer
+    # @rbs return: Integer | nil
+    def line_offset__overload2(node, line_offset)
+      line_offset(node.location.start_line - 1 + line_offset)
+    end
+
     # @rbs parse_error: Prism::ParseError
     # @rbs return: Integer | nil
-    def src_offset__overload1(parse_error)
-      src_offset(parse_error.location.start_line - 1)
+    def line_offset__overload3(parse_error)
+      line_offset(parse_error.location.start_line - 1)
+    end
+
+    # @rbs (Integer) -> String
+    #    | (Node::BaseNode) -> String
+    def line_indent(*args)
+      case args
+      in [Integer]
+        line_indent__overload0(*args)
+      in [Node::BaseNode]
+        line_indent__overload1(*args)
+      end
+    end
+
+    # @rbs line_num: Integer
+    # @rbs return: String
+    def line_indent__overload0(line_num)
+      line(line_num)[/\A[ \t]*/] || ""
+    end
+
+    # @rbs node: Node::BaseNode
+    # @rbs return: String
+    def line_indent__overload1(node)
+      line_indent(node.location.start_line - 1)
     end
 
     # @rbs return: void

data/lib/ruby_mod_kit/memo/ivar_memo.rb

@@ -12,12 +12,14 @@ module RubyModKit
       # @rbs @indent: String
       # @rbs @name: Symbol
       # @rbs @visibility: nil | Symbol
+      # @rbs @separator: String
 
       attr_reader :type #: nil | String
       attr_reader :attr_kind #: nil | Symbol
       attr_accessor :offset #: nil | Integer
       attr_accessor :indent #: String
       attr_accessor :visibility #: nil | Symbol
+      attr_accessor :separator #: String
 
       # @rbs name: Symbol
       # @rbs return: void

data/lib/ruby_mod_kit/memo/parameter_memo.rb

@@ -8,11 +8,13 @@ module RubyModKit
     class ParameterMemo < OffsetMemo
       # @rbs @type: String
       # @rbs @ivar_parameter: bool
-      # @rbs @qualifier: String
+      # @rbs @qualifier: String | nil
+      # @rbs @name: Symbol
 
       attr_reader :type #: String
       attr_accessor :ivar_parameter #: bool
-      attr_accessor :qualifier #: String
+      attr_accessor :qualifier #: String | nil
+      attr_accessor :name #: Symbol
 
       UNTYPED = "untyped"
 

data/lib/ruby_mod_kit/memo_pad.rb

@@ -68,5 +68,11 @@ module RubyModKit
 
       method_memo(def_node).add_parameter(memo)
     end
+
+    # @rbs &block: (Memo::ParameterMemo) -> void
+    # @rbs return: void
+    def each_parameter_memo(&block)
+      parameters_memo.each_value(&block)
+    end
   end
 end

data/lib/ruby_mod_kit/mission.rb

@@ -10,9 +10,5 @@ module RubyModKit
     def perform(_generation)
       raise RubyModKit::Error, "Unexpected type #{self.class}"
     end
-
-    # @rbs offset_diff: OffsetDiff
-    # @rbs return: void
-    def succ(offset_diff); end
   end
 end

data/lib/ruby_mod_kit/node/base_node.rb

@@ -93,10 +93,14 @@ module RubyModKit
       end
 
       # @rbs offset: Integer
+      # @rbs allowed: Array[Class] | nil
       # @rbs return: Node::DefParentNode | nil
-      def def_parent_node_at(offset)
+      def def_parent_node_at(offset, allowed: nil)
         node = node_at(offset) || return
-        [node, *node.ancestors].each { return _1 if _1.is_a?(Node::DefParentNode) }
+        [node, *node.ancestors].each do |ancestor_node|
+          return ancestor_node if ancestor_node.is_a?(Node::DefParentNode)
+          return nil if allowed && !allowed.include?(ancestor_node.class)
+        end
         nil
       end
 
@@ -111,6 +115,11 @@ module RubyModKit
         location.start_offset
       end
 
+      # @rbs return: String
+      def slice
+        location.slice
+      end
+
       # @rbs return: String
       def inspect
         str = +"#<#{self.class} "

data/lib/ruby_mod_kit/node/begin_node.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# rbs_inline: enabled
+
+module RubyModKit
+  module Node
+    # Transpiler program node
+    class BeginNode < Node::BaseNode
+      # @rbs @prism_node: Prism::BeginNode
+      # @rbs @parent: Node::BaseNode
+      # @rbs @prev: Node::BaseNode | nil
+
+      private attr_reader :prism_node #: Prism::BeginNode
+      attr_reader :parent #: Node::BaseNode
+      attr_reader :prev #: Node::BaseNode | nil
+
+      # @rbs prism_node: Prism::BeginNode
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
+      # @rbs return: void
+      def initialize(prism_node, parent:, prev: nil)
+        @prism_node = prism_node
+        @parent = parent
+        @prev = prev
+        raise RubyModKit::Error unless prism_node.is_a?(Prism::BeginNode)
+
+        super()
+      end
+    end
+  end
+end

data/lib/ruby_mod_kit/node/parameter_node.rb

@@ -13,7 +13,7 @@ module RubyModKit
       # @rbs!
       #   type prism_node = Prism::RequiredParameterNode | Prism::OptionalKeywordParameterNode
       #                   | Prism::OptionalParameterNode | Prism::RequiredKeywordParameterNode
-      #                   | Prism::RestParameterNode
+      #                   | Prism::RestParameterNode | Prism::BlockParameterNode
 
       private attr_reader :prism_node #: prism_node
       attr_reader :parent #: Node::BaseNode
@@ -30,7 +30,7 @@ module RubyModKit
         case prism_node
         when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
              Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
-             Prism::RestParameterNode
+             Prism::RestParameterNode, Prism::BlockParameterNode
           super()
         else
           raise RubyModKit::Error, "unexpected prism node #{prism_node.class}"

data/lib/ruby_mod_kit/node/wrap.rb

@@ -20,6 +20,8 @@ module RubyModKit
       # @rbs return: Node::BaseNode
       def wrap(prism_node, parent:, prev: nil)
         case prism_node
+        when Prism::BeginNode
+          Node::BeginNode.new(prism_node, parent: parent, prev: prev)
         when Prism::CallNode
           Node::CallNode.new(prism_node, parent: parent, prev: prev)
         when Prism::DefNode
@@ -28,7 +30,7 @@ module RubyModKit
           Node::DefParentNode.new(prism_node, parent: parent, prev: prev)
         when Prism::RequiredParameterNode, Prism::OptionalKeywordParameterNode,
             Prism::OptionalParameterNode, Prism::RequiredKeywordParameterNode,
-            Prism::RestParameterNode
+            Prism::RestParameterNode, Prism::BlockParameterNode
           Node::ParameterNode.new(prism_node, parent: parent, prev: prev)
         when Prism::StatementsNode
           Node::StatementsNode.new(prism_node, parent: parent, prev: prev)

data/lib/ruby_mod_kit/node.rb

@@ -7,6 +7,7 @@ module RubyModKit
 end
 
 require_relative "node/base_node"
+require_relative "node/begin_node"
 require_relative "node/symbol_node"
 require_relative "node/def_parent_node"
 require_relative "node/call_node"

data/lib/ruby_mod_kit/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module RubyModKit
-  VERSION = "0.0.4" #: String
+  VERSION = "0.0.5" #: String
 end

data/lib/ruby_mod_kit.rb

@@ -89,8 +89,3 @@ require_relative "ruby_mod_kit/memo_pad"
 require_relative "ruby_mod_kit/mission"
 require_relative "ruby_mod_kit/node"
 require_relative "ruby_mod_kit/offset_diff"
-
-require_relative "ruby_mod_kit/feature/instance_variable_parameter"
-require_relative "ruby_mod_kit/feature/overload"
-require_relative "ruby_mod_kit/feature/type"
-require_relative "ruby_mod_kit/feature/type/rbs_inline"

data/sig/generated/ruby_mod_kit/core_ext/eval.rbs

@@ -6,10 +6,12 @@ module RubyModKit
     # the extension for eval
     module Eval
       # @rbs expr: String
-      # @rbs *rest: Object
+      # @rbs binding: Binding
+      # @rbs fname: String
+      # @rbs lineno: Integer
       # @rbs transpile: bool
       # @rbs return: Object
-      def self?.eval: (String expr, *Object rest, ?transpile: bool) -> Object
+      def self?.eval: (String expr, ?Binding binding, ?String fname, ?Integer lineno, ?transpile: bool) -> Object
     end
   end
 

data/sig/generated/ruby_mod_kit/corrector.rbs

@@ -10,5 +10,8 @@ module RubyModKit
     # @rbs _generation: Generation
     # @rbs return: void
     def correct: (untyped _parse_error, untyped _generation) -> void
+
+    # @rbs return: void
+    def setup: () -> void
   end
 end

data/sig/generated/ruby_mod_kit/corrector_manager.rbs

@@ -3,7 +3,7 @@
 module RubyModKit
   # the class to manege parse error correctors
   class CorrectorManager
-    @previous_error_messages: Array[String]
+    @previous_source: String
 
     @correctors_error_map: Hash[Symbol, Array[Corrector]]
 

data/sig/generated/ruby_mod_kit/feature/type/check/arguments/add_arguments_checker_mission.rbs

@@ -0,0 +1,16 @@
+# Generated from lib/ruby_mod_kit/feature/type/check/arguments/add_arguments_checker_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      module Check
+        # The mission to add magic comment
+        class AddArgumentsCheckerMission < Mission
+          # @rbs generation: Generation
+          # @rbs return: bool
+          def perform: (Generation generation) -> bool
+        end
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/check/arguments.rbs

@@ -0,0 +1,15 @@
+# Generated from lib/ruby_mod_kit/feature/type/check/arguments.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      module Check
+        # namespace for arguments type checker
+        class Arguments < Feature
+          # @rbs return: Array[Mission]
+          def create_missions: () -> Array[Mission]
+        end
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/parameter_arrow_corrector.rbs

@@ -5,9 +5,14 @@ module RubyModKit
     class Type
       # the class to correct `def foo(Bar => bar, *Buz => buz)` -> `def foo(bar, *buz)`
       class ParameterArrowCorrector < Corrector
+        @last_parameter_offsets: Set[Integer]
+
         # @rbs return: Array[Symbol]
         def correctable_error_types: () -> Array[Symbol]
 
+        # @rbs return: void
+        def setup: () -> void
+
         # @rbs parse_error: Prism::ParseError
         # @rbs generation: Generation
         # @rbs return: void

data/sig/generated/ruby_mod_kit/feature/type/yard/type_parameter_mission.rbs

@@ -0,0 +1,16 @@
+# Generated from lib/ruby_mod_kit/feature/type/yard/type_parameter_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      class Yard
+        # The mission for parameter types
+        class TypeParameterMission < Mission
+          # @rbs generation: Generation
+          # @rbs return: bool
+          def perform: (Generation generation) -> bool
+        end
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/yard/type_return_mission.rbs

@@ -0,0 +1,16 @@
+# Generated from lib/ruby_mod_kit/feature/type/yard/type_return_mission.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      class Yard
+        # The mission for return value type
+        class TypeReturnMission < Mission
+          # @rbs generation: Generation
+          # @rbs return: bool
+          def perform: (Generation generation) -> bool
+        end
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/feature/type/yard.rbs

@@ -0,0 +1,17 @@
+# Generated from lib/ruby_mod_kit/feature/type/yard.rb with RBS::Inline
+
+module RubyModKit
+  class Feature
+    class Type
+      # namespace for type with rbs-line feature
+      class Yard < Feature
+        # @rbs return: Array[Mission]
+        def create_missions: () -> Array[Mission]
+
+        # @rbs type: String
+        # @rbs return: String
+        def self.rbs2yard: (String type) -> String
+      end
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/generation.rbs

@@ -29,6 +29,8 @@ module RubyModKit
 
     @offsets: Array[Integer]
 
+    @source: String
+
     attr_reader script: String
 
     attr_reader memo_pad: MemoPad
@@ -73,13 +75,9 @@ module RubyModKit
     # @rbs return: String
     def []=: (Integer src_offset, Integer length, String str) -> String
 
-    # @rbs src_range: Range[Integer]
-    # @rbs return: String
-    def []: (Range[Integer] src_range) -> String
-
-    # @rbs offset: Integer
+    # @rbs src_range: Range[Integer | nil]
     # @rbs return: String
-    def line_by_offset: (Integer offset) -> String
+    def []: (Range[Integer | nil] src_range) -> String
 
     # @rbs (Integer) -> String
     #    | (Node::BaseNode) -> String
@@ -101,17 +99,43 @@ module RubyModKit
     def line__overload2: (Prism::ParseError parse_error) -> String
 
     # @rbs (Integer) -> (Integer | nil)
+    #    | (Node::BaseNode) -> (Integer | nil)
+    #    | (Node::BaseNode, Integer) -> (Integer | nil)
     #    | (Prism::ParseError) -> (Integer | nil)
-    def src_offset: (Integer) -> (Integer | nil)
-                  | (Prism::ParseError) -> (Integer | nil)
+    def line_offset: (Integer) -> (Integer | nil)
+                   | (Node::BaseNode) -> (Integer | nil)
+                   | (Node::BaseNode, Integer) -> (Integer | nil)
+                   | (Prism::ParseError) -> (Integer | nil)
 
     # @rbs line_num: Integer
     # @rbs return: Integer | nil
-    def src_offset__overload0: (Integer line_num) -> (Integer | nil)
+    def line_offset__overload0: (Integer line_num) -> (Integer | nil)
+
+    # @rbs node: Node::BaseNode
+    # @rbs return: Integer | nil
+    def line_offset__overload1: (Node::BaseNode node) -> (Integer | nil)
+
+    # @rbs node: Node::BaseNode
+    # @rbs line_offset: Integer
+    # @rbs return: Integer | nil
+    def line_offset__overload2: (Node::BaseNode node, Integer line_offset) -> (Integer | nil)
 
     # @rbs parse_error: Prism::ParseError
     # @rbs return: Integer | nil
-    def src_offset__overload1: (Prism::ParseError parse_error) -> (Integer | nil)
+    def line_offset__overload3: (Prism::ParseError parse_error) -> (Integer | nil)
+
+    # @rbs (Integer) -> String
+    #    | (Node::BaseNode) -> String
+    def line_indent: (Integer) -> String
+                   | (Node::BaseNode) -> String
+
+    # @rbs line_num: Integer
+    # @rbs return: String
+    def line_indent__overload0: (Integer line_num) -> String
+
+    # @rbs node: Node::BaseNode
+    # @rbs return: String
+    def line_indent__overload1: (Node::BaseNode node) -> String
 
     # @rbs return: void
     def perform_corrector: () -> void

data/sig/generated/ruby_mod_kit/memo/ivar_memo.rbs

@@ -16,6 +16,8 @@ module RubyModKit
 
       @visibility: nil | Symbol
 
+      @separator: String
+
       attr_reader type: nil | String
 
       attr_reader attr_kind: nil | Symbol
@@ -26,6 +28,8 @@ module RubyModKit
 
       attr_accessor visibility: nil | Symbol
 
+      attr_accessor separator: String
+
       # @rbs name: Symbol
       # @rbs return: void
       def initialize: (Symbol name) -> void

data/sig/generated/ruby_mod_kit/memo/parameter_memo.rbs

@@ -8,13 +8,17 @@ module RubyModKit
 
       @ivar_parameter: bool
 
-      @qualifier: String
+      @qualifier: String | nil
+
+      @name: Symbol
 
       attr_reader type: String
 
       attr_accessor ivar_parameter: bool
 
-      attr_accessor qualifier: String
+      attr_accessor qualifier: String | nil
+
+      attr_accessor name: Symbol
 
       UNTYPED: ::String
 

data/sig/generated/ruby_mod_kit/memo_pad.rbs

@@ -46,5 +46,9 @@ module RubyModKit
     # @rbs node: Node::BaseNode
     # @rbs return: Memo::ParameterMemo
     def parameter_memo: (Node::BaseNode node) -> Memo::ParameterMemo
+
+    # @rbs &block: (Memo::ParameterMemo) -> void
+    # @rbs return: void
+    def each_parameter_memo: () { (Memo::ParameterMemo) -> void } -> void
   end
 end

data/sig/generated/ruby_mod_kit/mission.rbs

@@ -6,9 +6,5 @@ module RubyModKit
     # @rbs _generation: Generation
     # @rbs return: void
     def perform: (untyped _generation) -> void
-
-    # @rbs offset_diff: OffsetDiff
-    # @rbs return: void
-    def succ: (OffsetDiff offset_diff) -> void
   end
 end

data/sig/generated/ruby_mod_kit/node/base_node.rbs

@@ -51,8 +51,9 @@ module RubyModKit
       def parameter_node_at: (Integer offset) -> (Node::ParameterNode | nil)
 
       # @rbs offset: Integer
+      # @rbs allowed: Array[Class] | nil
       # @rbs return: Node::DefParentNode | nil
-      def def_parent_node_at: (Integer offset) -> (Node::DefParentNode | nil)
+      def def_parent_node_at: (Integer offset, ?allowed: Array[Class] | nil) -> (Node::DefParentNode | nil)
 
       # @rbs offset: Integer
       # @rbs return: bool
@@ -61,6 +62,9 @@ module RubyModKit
       # @rbs return: Integer
       def offset: () -> Integer
 
+      # @rbs return: String
+      def slice: () -> String
+
       # @rbs return: String
       def inspect: () -> String
 

data/sig/generated/ruby_mod_kit/node/begin_node.rbs

@@ -0,0 +1,26 @@
+# Generated from lib/ruby_mod_kit/node/begin_node.rb with RBS::Inline
+
+module RubyModKit
+  module Node
+    # Transpiler program node
+    class BeginNode < Node::BaseNode
+      @prism_node: Prism::BeginNode
+
+      @parent: Node::BaseNode
+
+      @prev: Node::BaseNode | nil
+
+      attr_reader prism_node: Prism::BeginNode
+
+      attr_reader parent: Node::BaseNode
+
+      attr_reader prev: Node::BaseNode | nil
+
+      # @rbs prism_node: Prism::BeginNode
+      # @rbs parent: Node::BaseNode
+      # @rbs prev: Node::BaseNode | nil
+      # @rbs return: void
+      def initialize: (Prism::BeginNode prism_node, parent: Node::BaseNode, ?prev: Node::BaseNode | nil) -> void
+    end
+  end
+end

data/sig/generated/ruby_mod_kit/node/parameter_node.rbs

@@ -10,7 +10,7 @@ module RubyModKit
 
       @prev: Node::BaseNode | nil
 
-      type prism_node = Prism::RequiredParameterNode | Prism::OptionalKeywordParameterNode | Prism::OptionalParameterNode | Prism::RequiredKeywordParameterNode | Prism::RestParameterNode
+      type prism_node = Prism::RequiredParameterNode | Prism::OptionalKeywordParameterNode | Prism::OptionalParameterNode | Prism::RequiredKeywordParameterNode | Prism::RestParameterNode | Prism::BlockParameterNode
 
       attr_reader prism_node: prism_node