katakata_irb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7e44af7218463a13dd4e072748d5880924a3b5678f8c30200f3e5bfde391cd
-  data.tar.gz: c0a6c33286b4a8197ad594f16baa87892448ea487e2faa153cac4d8f48d4208f
+  metadata.gz: 6e13d1b43d98e8be7595125b4e1e27533d83da1ee4d87df0dfb613d8fb8adee4
+  data.tar.gz: ae508bc65cd1049100fe4811b1d2b27036b30131cab13821d52b637e91e2ed41
 SHA512:
-  metadata.gz: c79ea66192ad0c3f671a8cbaa9cf2d497b6b662482615a6f497e9a86ad6f797cc4d7b8d228bd44afd4c0968736a1ea83630311d2056b3bd4ae4befc1d2c94609
-  data.tar.gz: d3cde5bdd7a966ecf6a06e82bdd9f276664e513999902e37e3abd1a0870452e4eb8265c43949ce8c7f110e6786980a79e4b07abaf0dd7880c37dee39a27865c3
+  metadata.gz: be9ed49c8de27772f7ec154df136134e9d5319a851fe392656a67d3c49069ed040a41b2af8deb6e81577c0c59c6d5bc0918a8165e09ccab2bce15fd6f09abba8
+  data.tar.gz: 8d9554e6532488742e156d39e7ee63c3c2461900db42badfd0d49990e35769b1e0f34a8cd746d5aab57839d3f31e894a081ec42389cd2383dafab5043d3fa578

data/Gemfile.lock

@@ -1,15 +1,21 @@
 PATH
   remote: .
   specs:
-    katakata_irb (0.1.3)
+    katakata_irb (0.1.4)
+      irb (>= 1.4.0)
       rbs
 
 GEM
   remote: https://rubygems.org/
   specs:
+    io-console (0.6.0)
+    irb (1.6.2)
+      reline (>= 0.3.0)
     minitest (5.16.3)
     rake (13.0.6)
     rbs (2.7.0)
+    reline (0.3.2)
+      io-console (~> 0.5)
 
 PLATFORMS
   x86_64-darwin-20
@@ -20,4 +26,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.4.0.dev
+   2.4.5

data/README.md

@@ -9,9 +9,15 @@ gem install katakata_irb
 ```
 ## Usage
 
+Just require katakata_irb or write it to your `.irbrc` file.
+```ruby
+require 'katakata_irb'
+```
+
 ```
-% kirb
-irb(main):001:0> [1,'a'].sample.a█
+irb(main):001:0> require 'katakata_irb'
+=> true
+irb(main):002:0> [1,'a'].sample.a█
                 |[1,'a'].sample.abs        |
                 |[1,'a'].sample.abs2       |
                 |[1,'a'].sample.allbits?   |
@@ -22,30 +28,14 @@ irb(main):001:0> [1,'a'].sample.a█
 ```
 
 ```
-% kirb
-irb(main):001:0> a = 10
+irb(main):001:0> require 'katakata_irb'
+=> true
+irb(main):002:0> a = 10
 => 10
-irb(main):002:1* if true
-irb(main):003:2*   b = a.times.map do
-irb(main):004:2*     _1.to_s
-irb(main):005:1*   end
-irb(main):006:1*   b[0].a█
+irb(main):003:1* if true
+irb(main):004:2*   b = a.times.map do
+irb(main):005:2*     _1.to_s
+irb(main):006:1*   end
+irb(main):007:1*   b[0].a█
                   |b[0].ascii_only?|
 ```
-
-```ruby
-require 'katakata_irb/completor'
-KatakataIrb::Completor.setup
-10.times do |i|
-  binding.irb
-end
-```
-
-## Options
-
-### `kirb --debug-output`
-Show debug output if it meets unimplemented syntax or something
-
-### `kirb --without-patch`
-`kirb` will apply some patches to reline and irb/ruby-lex.rb by default. This option will disable it.
-See `lib/katakata_irb/ruby_lex_patch.rb` and `lib/katakata_irb/reline_patches/*.patch`

data/bin/console

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
-require_relative '../lib/katakata_irb'
-require_relative '../lib/katakata_irb/reline_patch'
-KatakataIrb.log_output = STDERR
-KatakataIrb::RelinePatch.require_patched_reline
 require 'bundler/setup'
 require 'katakata_irb'
-require 'katakata_irb/ruby_lex_patch'
-KatakataIrb::RubyLexPatch.patch_to_ruby_lex
-KatakataIrb.repl
+KatakataIrb.log_output = STDERR
+IRB.start(__FILE__)

data/katakata_irb.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "IRB with Typed Completion"
   spec.homepage = "http://github.com/tompng/katakata_irb"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.0.0" # recommend >= 3.1.0
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "http://github.com/tompng/katakata_irb"
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
+  spec.add_dependency 'irb', '>= 1.4.0'
   spec.add_dependency 'rbs'
 
   # For more information and examples about making a new gem, check out our

data/lib/katakata_irb/completor.rb

@@ -1,4 +1,4 @@
-require_relative 'trex'
+require_relative 'nesting_parser'
 require_relative 'type_simulator'
 require 'rbs'
 require 'rbs/cli'
@@ -6,15 +6,17 @@ require 'irb'
 
 module KatakataIrb::Completor
   using KatakataIrb::TypeSimulator::LexerElemMatcher
-
   HIDDEN_METHODS = %w[Namespace TypeName] # defined by rbs, should be hidden
+  singleton_class.attr_accessor :prev_analyze_result
 
   def self.setup
     completion_proc = ->(target, preposing = nil, postposing = nil) do
       code = "#{preposing}#{target}"
       irb_context = IRB.conf[:MAIN_CONTEXT]
       binding = irb_context.workspace.binding
-      candidates = case analyze code, binding
+      result = analyze code, binding
+      KatakataIrb::Completor.prev_analyze_result = result
+      candidates = case result
       in [:require | :require_relative => method, name]
         if method == :require
           IRB::InputCompletor.retrieve_files_to_require_from_load_path
@@ -57,6 +59,44 @@ module KatakataIrb::Completor
       KatakataIrb.log_puts "#{e.inspect} stored to $error"
       KatakataIrb.log_puts
     end
+
+    IRB::InputCompletor.singleton_class.prepend Module.new{
+      def retrieve_completion_data(input, _bind: IRB.conf[:MAIN_CONTEXT].workspace.binding, doc_namespace: false)
+        return super unless doc_namespace
+        name = input[/[a-zA-Z_0-9]+[!?=]?\z/]
+        method_doc = -> type do
+          type = type.types.find { _1.all_methods.include? name.to_sym }
+          if type in KatakataIrb::Types::SingletonType
+            "#{type.module_or_class.name}.#{name}"
+          elsif type in KatakataIrb::Types::InstanceType
+            "#{type.klass.name}##{name}"
+          end
+        end
+        call_or_const_doc = -> type do
+          if name =~ /\A[A-Z]/
+            type = type.types.grep(KatakataIrb::Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
+            type.module_or_class == Object ? name : "#{type.module_or_class.name}::#{name}" if type
+          else
+            method_doc.call(type)
+          end
+        end
+
+        case KatakataIrb::Completor.prev_analyze_result
+        in [:call_or_const, type, _name, _self_call]
+          call_or_const_doc.call type
+        in [:const, type, _name]
+          # when prev_analyze_result is const, current analyze result might be call
+          call_or_const_doc.call type
+        in [:gvar, _name]
+          name
+        in [:call, type, _name, _self_call]
+          method_doc.call type
+        in [:lvar_or_method, _name, scope]
+          method_doc.call scope.self_type unless scope.local_variables.include?(name)
+        else
+        end
+      end
+    }
   end
 
   def self.analyze(code, binding = Kernel.binding)
@@ -65,8 +105,8 @@ module KatakataIrb::Completor
     end.join + "nil;\n"
     code = lvars_code + code
     tokens = RubyLex.ripper_lex_without_warning code
-    tokens = KatakataIrb::TRex.interpolate_ripper_ignored_tokens code, tokens
-    last_opens = KatakataIrb::TRex.parse(tokens)
+    tokens = KatakataIrb::NestingParser.interpolate_ripper_ignored_tokens code, tokens
+    last_opens = KatakataIrb::NestingParser.parse(tokens)
     closings = last_opens.map do |t|
       case t.tok
       when /\A%.[<>]\z/
@@ -89,7 +129,6 @@ module KatakataIrb::Completor
       end
     end
 
-    return if code =~ /[!?]\z/
     case tokens.last
     in { event: :on_ignored_by_ripper, tok: '.' }
       suffix = 'method'

data/lib/katakata_irb/{trex.rb → nesting_parser.rb}

@@ -1,5 +1,4 @@
-module KatakataIrb; end
-module KatakataIrb::TRex
+module KatakataIrb::NestingParser
   def self.interpolate_ripper_ignored_tokens(code, tokens)
     line_positions = code.lines.reduce([0]) { _1 << _1.last + _2.bytesize }
     prev_byte_pos = 0
@@ -31,13 +30,17 @@ module KatakataIrb::TRex
     opens = []
     pending_heredocs = []
     first_token_on_line = true
-    tokens.each_with_index do |t, index|
+    tokens.each do |t|
       skip = false
       last_tok, state, args = opens.last
       case state
       when :in_unquoted_symbol
-        opens.pop
-        skip = true if %i[on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick].include?(t.event)
+        unless t.event == :on_sp
+          opens.pop
+          skip = true
+        end
+      when :in_lambda_head
+        opens.pop if t.event == :on_tlambeg || (t.event == :on_kw && t.tok == 'do')
       when :in_method_head
         unless %i[on_sp on_ignored_nl on_comment on_embdoc_beg on_embdoc on_embdoc_end].include?(t.event)
           next_args = []
@@ -160,6 +163,8 @@ module KatakataIrb::TRex
               opens << [t, nil]
             end
           end
+        when :on_tlambda
+          opens << [t, :in_lambda_head]
         when :on_lparen, :on_lbracket, :on_lbrace, :on_tlambeg, :on_embexpr_beg, :on_embdoc_beg
           opens << [t, nil]
         when :on_rparen, :on_rbracket, :on_rbrace, :on_embexpr_end, :on_embdoc_end
@@ -188,10 +193,10 @@ module KatakataIrb::TRex
         first_token_on_line = false
       end
       if pending_heredocs.any? && t.tok.include?("\n")
-        pending_heredocs.reverse_each { opens << [_1, nil] }
+        pending_heredocs.reverse_each { |t| opens << [t, nil] }
         pending_heredocs = []
       end
-      yield t, index, opens if block_given?
+      yield t, opens if block_given?
     end
     opens.map(&:first) + pending_heredocs.reverse
   end
@@ -201,7 +206,7 @@ module KatakataIrb::TRex
     prev_opens = []
     min_depth = 0
     output = []
-    last_opens = parse(tokens) do |t, _index, opens|
+    last_opens = parse(tokens) do |t, opens|
       depth = t == opens.last&.first ? opens.size - 1 : opens.size
       min_depth = depth if depth < min_depth
       if t.tok.include?("\n")

data/lib/katakata_irb/type_simulator.rb

@@ -31,13 +31,13 @@ class KatakataIrb::TypeSimulator
         fallback = KatakataIrb::Types::NIL
         case BaseScope.type_by_name name
         when :cvar
-          KatakataIrb::TypeSimulator.type_of(fallback:) { @self_object.class_variable_get name }
+          KatakataIrb::TypeSimulator.type_of(fallback: fallback) { @self_object.class_variable_get name }
         when :ivar
-          KatakataIrb::TypeSimulator.type_of(fallback:) { @self_object.instance_variable_get name }
+          KatakataIrb::TypeSimulator.type_of(fallback: fallback) { @self_object.instance_variable_get name }
         when :lvar
-          KatakataIrb::TypeSimulator.type_of(fallback:) { @binding.local_variable_get(name) }
+          KatakataIrb::TypeSimulator.type_of(fallback: fallback) { @binding.local_variable_get(name) }
         when :const
-          KatakataIrb::TypeSimulator.type_of(fallback:) { @binding.eval name }
+          KatakataIrb::TypeSimulator.type_of(fallback: fallback) { @binding.eval name }
         end
       )
     end
@@ -85,7 +85,7 @@ class KatakataIrb::TypeSimulator
   class Scope
     attr_reader :parent, :jump_branches
 
-    def self.from_binding(binding) = new BaseScope.new(binding, binding.eval('self'))
+    def self.from_binding(binding) = new(BaseScope.new(binding, binding.eval('self')))
 
     def initialize(parent, table = {}, trace_cvar: true, trace_ivar: true, trace_lvar: true, passthrough: false)
       @tables = [table]
@@ -243,8 +243,8 @@ class KatakataIrb::TypeSimulator
     refine Ripper::Lexer::Elem do
       def deconstruct_keys(_keys)
         {
-          tok:,
-          event:,
+          tok: tok,
+          event: event,
           label: state.allbits?(Ripper::EXPR_LABEL),
           beg: state.allbits?(Ripper::EXPR_BEG),
           dot: state.allbits?(Ripper::EXPR_DOT)
@@ -280,7 +280,7 @@ class KatakataIrb::TypeSimulator
   end
 
   def simulate_evaluate(sexp, scope, case_target: nil)
-    result = simulate_evaluate_inner(sexp, scope, case_target:)
+    result = simulate_evaluate_inner(sexp, scope, case_target: case_target)
     @dig_targets.resolve result, scope if @dig_targets.target?(sexp)
     result
   end
@@ -635,6 +635,8 @@ class KatakataIrb::TypeSimulator
       KatakataIrb::Types::OBJECT
     in [:redo | :retry]
       scope.terminate
+    in [:zsuper]
+      KatakataIrb::Types::OBJECT
     in [:super, args]
       args, kwargs, _block = retrieve_method_args args
       args.each do |arg|
@@ -721,7 +723,7 @@ class KatakataIrb::TypeSimulator
       end
       else_branch = lambda do
         pattern.each { simulate_evaluate _1, scope }
-        simulate_evaluate(else_statement, scope, case_target:)
+        simulate_evaluate(else_statement, scope, case_target: case_target)
       end
       if if_statements && else_statement
         KatakataIrb::Types::UnionType[*scope.run_branches(if_branch, else_branch)]
@@ -741,7 +743,7 @@ class KatakataIrb::TypeSimulator
         },
         -> {
           pattern_scope.merge_jumps
-          else_statement ? simulate_evaluate(else_statement, scope, case_target:) : KatakataIrb::Types::NIL
+          else_statement ? simulate_evaluate(else_statement, scope, case_target: case_target) : KatakataIrb::Types::NIL
         }
       )
       KatakataIrb::Types::UnionType[*results]
@@ -1041,6 +1043,14 @@ class KatakataIrb::TypeSimulator
     types = type_breaks.map(&:first)
     breaks = type_breaks.map(&:last).compact
     types << OBJECT_METHODS[method_name.to_sym] if name_match && OBJECT_METHODS.has_key?(method_name.to_sym)
+
+    if method_name.to_sym == :new
+      receiver.types.each do |type|
+        if (type in KatakataIrb::Types::SingletonType) && type.module_or_class.is_a?(Class)
+          types << KatakataIrb::Types::InstanceType.new(type.module_or_class)
+        end
+      end
+    end
     KatakataIrb::Types::UnionType[*types, *breaks]
   end
 

data/lib/katakata_irb/types.rb

@@ -90,7 +90,7 @@ module KatakataIrb::Types
     when Array
       values = object.size > sample_size ? object.sample(sample_size) : object
       if max_level > 0
-        InstanceType.new Array, { Elem: UnionType[*values.map { type_from_object(_1, max_level:) }] }
+        InstanceType.new Array, { Elem: UnionType[*values.map { type_from_object(_1, max_level: max_level) }] }
       else
         InstanceType.new Array, { Elem: UnionType[*values.map(&:class).uniq.map { InstanceType.new _1 }] }
       end
@@ -98,8 +98,8 @@ module KatakataIrb::Types
       keys = object.size > sample_size ? object.keys.sample(sample_size) : object.keys
       values = object.size > sample_size ? object.values.sample(sample_size) : object.values
       if max_level > 0
-        key_types = keys.map { type_from_object(_1, max_level:) }
-        value_types = values.map { type_from_object(_1, max_level:) }
+        key_types = keys.map { type_from_object(_1, max_level: max_level) }
+        value_types = values.map { type_from_object(_1, max_level: max_level) }
         InstanceType.new Hash, { K: UnionType[*key_types], V: UnionType[*value_types] }
       else
         key_types = keys.map(&:class).uniq.map { InstanceType.new _1 }
@@ -120,7 +120,7 @@ module KatakataIrb::Types
     end
     def transform() = yield(self)
     def methods() = @module_or_class.methods
-    def all_methods() = methods
+    def all_methods() = methods | Kernel.methods
     def constants() = @module_or_class.constants
     def types() = [self]
   end
@@ -297,19 +297,13 @@ module KatakataIrb::Types
       # unimplemented
       OBJECT
     when RBS::Types::ClassInstance
-      classes = self_type.types.filter_map do |type|
-        type.module_or_class if (type in SingletonType) && type.module_or_class.is_a?(Class)
-      end
-      if classes.empty?
-        klass = return_type.name.to_namespace.path.reduce(Object) { _1.const_get _2 }
-        classes << klass if klass in Class
-      end
+      klass = return_type.name.to_namespace.path.reduce(Object) { _1.const_get _2 }
       if return_type.args
         args = return_type.args.map { from_rbs_type _1, self_type, extra_vars }
         names = rbs_builder.build_singleton(return_type.name).type_params
         params = names.map.with_index { [_1, args[_2] || OBJECT] }.to_h
       end
-      UnionType[*classes.map { InstanceType.new _1, params || {} }]
+      InstanceType.new klass, params || {}
     end
   end
 

data/lib/katakata_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KatakataIrb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/katakata_irb.rb

@@ -1,11 +1,7 @@
-require 'io/console'
-module KatakataIrb
-  def self.repl
-    require 'katakata_irb/completor'
-    KatakataIrb::Completor.setup
-    IRB.start(__FILE__)
-  end
+require 'katakata_irb/version'
+require 'katakata_irb/completor'
 
+module KatakataIrb
   def self.log_output=(output)
     @log_output = output
   end
@@ -14,3 +10,5 @@ module KatakataIrb
     STDOUT.cooked { @log_output&.puts(...) }
   end
 end
+
+KatakataIrb::Completor.setup

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -27,8 +41,7 @@ dependencies:
 description: IRB with Typed Completion
 email:
 - tomoyapenguin@gmail.com
-executables:
-- kirb
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -39,18 +52,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/kirb
 - katakata_irb.gemspec
 - lib/katakata_irb.rb
 - lib/katakata_irb/completor.rb
-- lib/katakata_irb/reline_patch.rb
-- lib/katakata_irb/reline_patches/escapeseq.patch
-- lib/katakata_irb/reline_patches/indent.patch
-- lib/katakata_irb/reline_patches/raw.patch
-- lib/katakata_irb/reline_patches/scrollbar.patch
-- lib/katakata_irb/reline_patches/wholelines.patch
-- lib/katakata_irb/ruby_lex_patch.rb
-- lib/katakata_irb/trex.rb
+- lib/katakata_irb/nesting_parser.rb
 - lib/katakata_irb/type_simulator.rb
 - lib/katakata_irb/types.rb
 - lib/katakata_irb/version.rb
@@ -69,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: IRB with Typed Completion

data/exe/kirb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../lib/katakata_irb'
-KatakataIrb.log_output = STDERR if ARGV.delete '--debug-output'
-unless ARGV.delete '--without-patch'
-  require_relative '../lib/katakata_irb/reline_patch'
-  KatakataIrb::RelinePatch.require_patched_reline
-  require 'katakata_irb/ruby_lex_patch'
-  KatakataIrb::RubyLexPatch.patch_to_ruby_lex
-end
-require 'katakata_irb'
-KatakataIrb.repl

data/lib/katakata_irb/reline_patch.rb

@@ -1,43 +0,0 @@
-module KatakataIrb; end
-module KatakataIrb::RelinePatch
-  module RelinePatchIseqLoader; end
-  def self.require_patched_reline
-    # Apply patches of unmerged pull-request to reline
-    patches = %w[wholelines escapeseq indent raw scrollbar]
-    patched = {}
-    require 'reline/version.rb' # result of $LOAD_PATH.resolve_feature_path will change after this require
-    patches.each do |patch_name|
-      patch = File.read File.expand_path("reline_patches/#{patch_name}.patch", File.dirname(__FILE__))
-      current_patched = {}
-      patch.gsub(/^diff.+\nindex.+$/, '').split(/^--- a(.+)\n\+\+\+ b(.+)\n/).drop(1).each_slice(3) do |file, newfile, diff|
-        raise if file != newfile
-        _, path = $LOAD_PATH.resolve_feature_path file.sub(%r{^/lib/}, '')
-        code = current_patched[path] || patched[path] || File.read(path)
-        diff.split(/^@@.+\n/).drop(1).map(&:lines).each do |lines|
-          target = lines.reject { _1[0] == '+' }.map { _1[1..] }.join
-          replace = lines.reject { _1[0] == '-' }.map { _1[1..] }.join
-          if code.include? target
-            code = code.sub target, replace
-          elsif !code.include?(replace)
-            raise
-          end
-        end
-        current_patched[path] = code
-      end
-      patched.update current_patched
-    rescue
-      KatakataIrb.log_puts "Failed to apply katakata_irb/reline_patches/#{patch_name}.patch to reline"
-    end
-
-    RelinePatchIseqLoader.define_method :load_iseq do |fname|
-      if patched.key? fname
-        RubyVM::InstructionSequence.compile patched[fname], fname
-      else
-        RubyVM::InstructionSequence.compile_file fname
-      end
-    end
-    RubyVM::InstructionSequence.singleton_class.prepend RelinePatchIseqLoader
-    require 'reline'
-    RelinePatchIseqLoader.undef_method :load_iseq
-  end
-end

data/lib/katakata_irb/reline_patches/escapeseq.patch

@@ -1,45 +0,0 @@
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index 1c33a4b..bbf5e6c 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -663,8 +663,10 @@ class Reline::LineEditor
-     dialog.set_cursor_pos(cursor_column, @first_line_started_from + @started_from)
-     dialog_render_info = dialog.call(@last_key)
-     if dialog_render_info.nil? or dialog_render_info.contents.nil? or dialog_render_info.contents.empty?
-+      lines = whole_lines
-       dialog.lines_backup = {
--        lines: modify_lines(whole_lines),
-+        unmodified_lines: lines,
-+        lines: modify_lines(lines),
-         line_index: @line_index,
-         first_line_started_from: @first_line_started_from,
-         started_from: @started_from,
-@@ -766,8 +768,10 @@ class Reline::LineEditor
-     Reline::IOGate.move_cursor_column(cursor_column)
-     move_cursor_up(dialog.vertical_offset + dialog.contents.size - 1)
-     Reline::IOGate.show_cursor
-+    lines = whole_lines
-     dialog.lines_backup = {
--      lines: modify_lines(whole_lines),
-+      unmodified_lines: lines,
-+      lines: modify_lines(lines),
-       line_index: @line_index,
-       first_line_started_from: @first_line_started_from,
-       started_from: @started_from,
-@@ -777,7 +781,7 @@ class Reline::LineEditor
-   private def reset_dialog(dialog, old_dialog)
-     return if dialog.lines_backup.nil? or old_dialog.contents.nil?
--    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
-+    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:unmodified_lines])
-     visual_lines = []
-     visual_start = nil
-     dialog.lines_backup[:lines].each_with_index { |l, i|
-@@ -888,7 +892,7 @@ class Reline::LineEditor
-   private def clear_each_dialog(dialog)
-     dialog.trap_key = nil
-     return unless dialog.contents
--    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
-+    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:unmodified_lines])
-     visual_lines = []
-     visual_lines_under_dialog = []
-     visual_start = nil

data/lib/katakata_irb/reline_patches/indent.patch

@@ -1,25 +0,0 @@
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index bbf5e6c..c9e613e 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -1707,17 +1707,18 @@ class Reline::LineEditor
-     end
-     new_lines = whole_lines
-     new_indent = @auto_indent_proc.(new_lines, @line_index, @byte_pointer, @check_new_auto_indent)
--    new_indent = @cursor_max if new_indent&.> @cursor_max
-     if new_indent&.>= 0
-       md = new_lines[@line_index].match(/\A */)
-       prev_indent = md[0].count(' ')
-       if @check_new_auto_indent
--        @buffer_of_lines[@line_index] = ' ' * new_indent + @buffer_of_lines[@line_index].lstrip
-+        line = @buffer_of_lines[@line_index] = ' ' * new_indent + @buffer_of_lines[@line_index].lstrip
-         @cursor = new_indent
-+        @cursor_max = calculate_width(line)
-         @byte_pointer = new_indent
-       else
-         @line = ' ' * new_indent + @line.lstrip
-         @cursor += new_indent - prev_indent
-+        @cursor_max = calculate_width(@line)
-         @byte_pointer += new_indent - prev_indent
-       end
-     end

data/lib/katakata_irb/reline_patches/raw.patch

@@ -1,95 +0,0 @@
-diff --git a/lib/reline.rb b/lib/reline.rb
-index f22b573..8716a0c 100644
---- a/lib/reline.rb
-+++ b/lib/reline.rb
-@@ -281,19 +281,21 @@ module Reline
-     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
- 
-     def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
--      unless confirm_multiline_termination
--        raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
--      end
--      inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
-+      Reline::IOGate.with_raw_input do
-+        unless confirm_multiline_termination
-+          raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
-+        end
-+        inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
- 
--      whole_buffer = line_editor.whole_buffer.dup
--      whole_buffer.taint if RUBY_VERSION < '2.7'
--      if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
--        Reline::HISTORY << whole_buffer
--      end
-+        whole_buffer = line_editor.whole_buffer.dup
-+        whole_buffer.taint if RUBY_VERSION < '2.7'
-+        if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
-+          Reline::HISTORY << whole_buffer
-+        end
- 
--      line_editor.reset_line if line_editor.whole_buffer.nil?
--      whole_buffer
-+        line_editor.reset_line if line_editor.whole_buffer.nil?
-+        whole_buffer
-+      end
-     end
- 
-     def readline(prompt = '', add_hist = false)
-diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
-index ab147a6..ccebe15 100644
---- a/lib/reline/ansi.rb
-+++ b/lib/reline/ansi.rb
-@@ -142,6 +142,10 @@ class Reline::ANSI
-     @@output = val
-   end
- 
-+  def self.with_raw_input
-+    @@input.raw { yield }
-+  end
-+
-   @@buf = []
-   def self.inner_getc
-     unless @@buf.empty?
-diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb
-index 92c76cb..9929846 100644
---- a/lib/reline/general_io.rb
-+++ b/lib/reline/general_io.rb
-@@ -31,6 +31,10 @@ class Reline::GeneralIO
-     @@input = val
-   end
- 
-+  def self.with_raw_input
-+    yield
-+  end
-+
-   def self.getc
-     unless @@buf.empty?
-       return @@buf.shift
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index 6acf969..e3985a3 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -452,7 +452,7 @@ class Reline::LineEditor
-       new_lines = whole_lines
-       prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-       modify_lines(new_lines).each_with_index do |line, index|
--        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\n"
-+        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\r\n"
-         Reline::IOGate.erase_after_cursor
-       end
-       @output.flush
-diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb
-index b952329..7ea2a00 100644
---- a/lib/reline/windows.rb
-+++ b/lib/reline/windows.rb
-@@ -291,6 +291,10 @@ class Reline::Windows
-     end
-   end
- 
-+  def self.with_raw_input
-+    yield
-+  end
-+
-   def self.getc
-     check_input_event
-     @@output_buf.shift

data/lib/katakata_irb/reline_patches/scrollbar.patch

@@ -1,34 +0,0 @@
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index 8153aab..50a063a 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -703,17 +703,17 @@ class Reline::LineEditor
-           dialog.scroll_top = dialog.pointer
-         end
-         pointer = dialog.pointer - dialog.scroll_top
-+      else
-+        dialog.scroll_top = 0
-       end
-       dialog.contents = dialog.contents[dialog.scroll_top, height]
-     end
--    if dialog.contents and dialog.scroll_top >= dialog.contents.size
--      dialog.scroll_top = dialog.contents.size - height
--    end
-     if dialog_render_info.scrollbar and dialog_render_info.contents.size > height
-       bar_max_height = height * 2
-       moving_distance = (dialog_render_info.contents.size - height) * 2
-       position_ratio = dialog.scroll_top.zero? ? 0.0 : ((dialog.scroll_top * 2).to_f / moving_distance)
-       bar_height = (bar_max_height * ((dialog.contents.size * 2).to_f / (dialog_render_info.contents.size * 2))).floor.to_i
-+      bar_height = 1 if bar_height.zero?
-       dialog.scrollbar_pos = ((bar_max_height - bar_height) * position_ratio).floor.to_i
-     else
-       dialog.scrollbar_pos = nil
-@@ -755,7 +755,7 @@ class Reline::LineEditor
-       str_width = dialog.width - (dialog.scrollbar_pos.nil? ? 0 : @block_elem_width)
-       str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
-       @output.write "\e[#{bg_color}m\e[#{fg_color}m#{str}"
--      if dialog.scrollbar_pos and (dialog.scrollbar_pos != old_dialog.scrollbar_pos or dialog.column != old_dialog.column)
-+      if dialog.scrollbar_pos
-         @output.write "\e[37m"
-         if dialog.scrollbar_pos <= (i * 2) and (i * 2 + 1) < (dialog.scrollbar_pos + bar_height)
-           @output.write @full_block

data/lib/katakata_irb/reline_patches/wholelines.patch

@@ -1,102 +0,0 @@
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index 8153aab..1c33a4b 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -449,12 +449,8 @@ class Reline::LineEditor
-       Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen)
-       Reline::IOGate.move_cursor_column(0)
-       @scroll_partial_screen = nil
--      prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
--      if @previous_line_index
--        new_lines = whole_lines(index: @previous_line_index, line: @line)
--      else
--        new_lines = whole_lines
--      end
-+      new_lines = whole_lines
-+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-       modify_lines(new_lines).each_with_index do |line, index|
-         @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\n"
-         Reline::IOGate.erase_after_cursor
-@@ -490,11 +486,7 @@ class Reline::LineEditor
-     if @is_multiline
-       if finished?
-         # Always rerender on finish because output_modifier_proc may return a different output.
--        if @previous_line_index
--          new_lines = whole_lines(index: @previous_line_index, line: @line)
--        else
--          new_lines = whole_lines
--        end
-+        new_lines = whole_lines
-         line = modify_lines(new_lines)[@line_index]
-         clear_dialog
-         prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-@@ -1013,11 +1005,7 @@ class Reline::LineEditor
-   end
- 
-   private def rerender_changed_current_line
--    if @previous_line_index
--      new_lines = whole_lines(index: @previous_line_index, line: @line)
--    else
--      new_lines = whole_lines
--    end
-+    new_lines = whole_lines
-     prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
-     all_height = calculate_height_by_lines(new_lines, prompt_list || prompt)
-     diff = all_height - @highest_in_all
-@@ -1698,7 +1686,7 @@ class Reline::LineEditor
-     return if not @check_new_auto_indent and @previous_line_index # move cursor up or down
-     if @check_new_auto_indent and @previous_line_index and @previous_line_index > 0 and @line_index > @previous_line_index
-       # Fix indent of a line when a newline is inserted to the next
--      new_lines = whole_lines(index: @previous_line_index, line: @line)
-+      new_lines = whole_lines
-       new_indent = @auto_indent_proc.(new_lines[0..-3].push(''), @line_index - 1, 0, true)
-       md = @line.match(/\A */)
-       prev_indent = md[0].count(' ')
-@@ -1713,11 +1701,7 @@ class Reline::LineEditor
-         @line = ' ' * new_indent + @line.lstrip
-       end
-     end
--    if @previous_line_index
--      new_lines = whole_lines(index: @previous_line_index, line: @line)
--    else
--      new_lines = whole_lines
--    end
-+    new_lines = whole_lines
-     new_indent = @auto_indent_proc.(new_lines, @line_index, @byte_pointer, @check_new_auto_indent)
-     new_indent = @cursor_max if new_indent&.> @cursor_max
-     if new_indent&.>= 0
-@@ -1803,11 +1787,7 @@ class Reline::LineEditor
-       target = before
-     end
-     if @is_multiline
--      if @previous_line_index
--        lines = whole_lines(index: @previous_line_index, line: @line)
--      else
--        lines = whole_lines
--      end
-+      lines = whole_lines
-       if @line_index > 0
-         preposing = lines[0..(@line_index - 1)].join("\n") + "\n" + preposing
-       end
-@@ -1907,7 +1887,7 @@ class Reline::LineEditor
-     @cursor_max = calculate_width(@line)
-   end
- 
--  def whole_lines(index: @line_index, line: @line)
-+  def whole_lines(index: @previous_line_index || @line_index, line: @line)
-     temp_lines = @buffer_of_lines.dup
-     temp_lines[index] = line
-     temp_lines
-@@ -1917,11 +1897,7 @@ class Reline::LineEditor
-     if @buffer_of_lines.size == 1 and @line.nil?
-       nil
-     else
--      if @previous_line_index
--        whole_lines(index: @previous_line_index, line: @line).join("\n")
--      else
--        whole_lines.join("\n")
--      end
-+      whole_lines.join("\n")
-     end
-   end
- 

data/lib/katakata_irb/ruby_lex_patch.rb

@@ -1,221 +0,0 @@
-require 'irb'
-require_relative 'trex'
-
-module KatakataIrb::RubyLexPatch
-  def self.patch_to_ruby_lex
-    (RubyLex.instance_methods(false) - [:set_prompt, :process_continue, :check_code_block]).each { RubyLex.remove_method _1 }
-    RubyLex.prepend self
-  end
-
-  def self.complete_tokens(code, context: nil)
-    incomplete_tokens = RubyLex.ripper_lex_without_warning(code, context: context)
-    KatakataIrb::TRex.interpolate_ripper_ignored_tokens(code, incomplete_tokens)
-  end
-
-  def calc_nesting_depth(opens)
-    indent_level = 0
-    nesting_level = 0
-    opens.each_with_index do |t, index|
-      case t.event
-      when :on_heredoc_beg
-        if opens[index + 1]&.event != :on_heredoc_beg
-          if t.tok.start_with?('<<~')
-            indent_level += 1
-          else
-            indent_level = 0
-          end
-        end
-      when :on_tstring_beg, :on_regexp_beg, :on_symbeg
-        indent_level += 1 if t.tok[0] == '%'
-      when :on_embdoc_beg
-        indent_level = 0
-      else
-        nesting_level += 1
-        indent_level += 1
-      end
-    end
-    [indent_level, nesting_level]
-  end
-
-  def process_indent_level(tokens)
-    opens = KatakataIrb::TRex.parse(tokens)
-    indent, _nesting = calc_nesting_depth(opens)
-    indent * 2
-  end
-
-  def check_corresponding_token_depth(tokens, line_index)
-    line_results = KatakataIrb::TRex.parse_line(tokens)
-    result = line_results[line_index]
-    return unless result
-    _tokens, prev, opens, min_depth = result
-    depth, = calc_nesting_depth(opens.take(min_depth))
-    prev_depth, = calc_nesting_depth(prev)
-    depth * 2 if depth < prev_depth
-  end
-
-  def ltype_from_open_tokens(opens)
-    return nil if opens.empty?
-    case opens.last.tok
-    when ?`, /^<<[-~]?`/, /^%x.$/
-      ?`
-    when ?', /^<<[-~]?'/, /^%q.$/
-      ?'
-    when ?", /^<</, /^%.$/, /^%Q.$/
-      ?"
-    when ":'", ':"', ':', /^%s.$/
-      ':'
-    when /^%[iwIW].$/
-      ']'
-    when '/', /^%r.$/
-      '/'
-    end
-  end
-
-  def check_termination_in_prev_line(code, context: nil)
-    tokens = self.class.ripper_lex_without_warning(code, context: context)
-    last_newline_index = tokens.rindex { |t| t.tok.include?("\n") }
-    index = (0...last_newline_index).reverse_each.find { |i| tokens[i].tok.include?("\n") }
-    return false unless index
-
-    last_line_tokens = tokens[(index + 1)..(tokens.size - 1)]
-    first_token = last_line_tokens.find do |t|
-      ![:on_sp, :on_ignored_sp, :on_comment].include?(t.event)
-    end
-
-    if first_token && first_token.state != Ripper::EXPR_DOT
-      tokens_without_last_line = tokens[0..index]
-      if check_termination(tokens_without_last_line.map(&:tok).join, context: context)
-        return last_line_tokens.map(&:tok).join
-      end
-    end
-    false
-  end
-
-  def check_termination(code, context: nil)
-    tokens = KatakataIrb::RubyLexPatch.complete_tokens(code, context: context)
-    opens = KatakataIrb::TRex.parse(tokens)
-    opens.empty? && !process_continue(tokens) && !check_code_block(code, tokens)
-  end
-
-  def set_input(io, p = nil, context: nil, &block)
-    @io = io
-    if @io.respond_to?(:check_termination)
-      @io.check_termination do |code|
-        if Reline::IOGate.in_pasting?
-          rest = check_termination_in_prev_line(code, context: context)
-          if rest
-            Reline.delete_text
-            rest.bytes.reverse_each do |c|
-              Reline.ungetc(c)
-            end
-            true
-          else
-            false
-          end
-        else
-          # Accept any single-line input for symbol aliases or commands that transform args
-          command = code.split(/\s/, 2).first
-          if context.symbol_alias?(command) || context.transform_args?(command)
-            next true
-          end
-
-          code.gsub!(/\s*\z/, '').concat("\n")
-          check_termination(code, context: context)
-        end
-      end
-    end
-    if @io.respond_to?(:dynamic_prompt)
-      @io.dynamic_prompt do |lines|
-        lines << '' if lines.empty?
-        code = lines.map{ |l| l + "\n" }.join
-        tokens = KatakataIrb::RubyLexPatch.complete_tokens code, context: context
-        line_results = KatakataIrb::TRex.parse_line(tokens)
-        continue = false
-        tokens_until_line = []
-        line_results.map.with_index do |(line_tokens, _prev_opens, next_opens), line_num_offset|
-          line_tokens.each do |token, _s|
-            tokens_until_line << token if token != tokens_until_line.last
-          end
-          continue = process_continue(tokens_until_line)
-          prompt next_opens, continue, line_num_offset
-        end
-      end
-    end
-
-    if p.respond_to?(:call)
-      @input = p
-    elsif block_given?
-      @input = block
-    else
-      @input = Proc.new{@io.gets}
-    end
-  end
-
-  def set_auto_indent(context)
-    if @io.respond_to?(:auto_indent) and context.auto_indent_mode
-      @io.auto_indent do |lines, line_index, byte_pointer, is_newline|
-        if is_newline
-          tokens = KatakataIrb::RubyLexPatch.complete_tokens(lines[0..line_index].join("\n"), context: context)
-          process_indent_level(tokens)
-        else
-          code = line_index.zero? ? '' : lines[0..(line_index - 1)].map{ |l| l + "\n" }.join
-          last_line = lines[line_index]&.byteslice(0, byte_pointer)
-          code += last_line if last_line
-          tokens = KatakataIrb::RubyLexPatch.complete_tokens(code, context: context)
-          check_corresponding_token_depth(tokens, line_index)
-        end
-      end
-    end
-  end
-
-  def prompt(opens, continue, line_num_offset)
-    ltype = ltype_from_open_tokens(opens)
-    _indent, nesting_level = calc_nesting_depth(opens)
-    @prompt.call(ltype, nesting_level, opens.any? || continue, @line_no + line_num_offset)
-  end
-
-  # TODO: do not use this. change the api. example: @input.call(prompt)
-  def store_prompt_to_irb(opens, continue, line_num_offset)
-    prompt(opens, continue, line_num_offset)
-  end
-
-  def readmultiline(context)
-    if @io.respond_to? :check_termination
-      store_prompt_to_irb([], false, 0)
-      @input.call
-    else
-      # nomultiline
-      line = ''
-      line_offset = 0
-      store_prompt_to_irb([], false, 0)
-      loop do
-        l = @input.call
-        unless l
-          return if line.empty?
-          next
-        end
-        line << l
-        tokens = KatakataIrb::RubyLexPatch.complete_tokens(line, context: context)
-        _line_tokens, _prev_opens, next_opens = KatakataIrb::TRex.parse_line(tokens).last
-        return line if next_opens.empty?
-        line_offset += 1
-        store_prompt_to_irb(next_opens, true, line_offset)
-      end
-    end
-  end
-
-  def each_top_level_statement(context = nil)
-    loop do
-      begin
-        line = readmultiline(context)
-        break unless line
-        if line != "\n"
-          line.force_encoding(@io.encoding)
-          yield line, @line_no
-        end
-        @line_no += line.count("\n")
-      rescue RubyLex::TerminateLineInput
-      end
-    end
-  end
-end