katakata_irb 0.1.3 → 0.1.5

data/lib/katakata_irb/types.rb

@@ -11,10 +11,18 @@ module KatakataIrb::Types
 
   Splat = Struct.new :item
 
+  MODULE_NAME_METHOD = Module.instance_method(:name)
+
+  def self.class_name_of(klass)
+    klass = klass.superclass if klass.singleton_class?
+    MODULE_NAME_METHOD.bind_call klass
+  end
+
   def self.rbs_search_method(klass, method_name, singleton)
     klass.ancestors.each do |ancestor|
-      next unless ancestor.name
-      type_name = RBS::TypeName(ancestor.name).absolute!
+      name = class_name_of ancestor
+      next unless name
+      type_name = RBS::TypeName(name).absolute!
       definition = (singleton ? rbs_builder.build_singleton(type_name) : rbs_builder.build_instance(type_name)) rescue nil
       method = definition&.methods&.[](method_name)
       return method if method
@@ -22,9 +30,29 @@ module KatakataIrb::Types
     nil
   end
 
+  def self.method_return_type(type, method_name)
+    receivers = type.types.map do |t|
+      case t
+      in ProcType
+        [t, Proc, false]
+      in SingletonType
+        [t, t.module_or_class, true]
+      in InstanceType
+        [t, t.klass, false]
+      end
+    end
+    types = receivers.flat_map do |receiver_type, klass, singleton|
+      method = rbs_search_method klass, method_name, singleton
+      next [] unless method
+      method.method_types.map do |method|
+        from_rbs_type(method.type.return_type, receiver_type, {})
+      end
+    end
+    UnionType[*types]
+  end
+
   def self.rbs_methods(type, method_name, args_types, kwargs_type, has_block)
-    types = (type in UnionType) ? type.types : [type]
-    receivers = types.map do |t|
+    receivers = type.types.map do |t|
       case t
       in ProcType
         [t, Proc, false]
@@ -60,8 +88,15 @@ module KatakataIrb::Types
             given << UnionType[*centers.drop(opts.size)]
             expected << rest.type
           end
-          score += given.zip(expected).count do |t, e|
-            intersect? t, from_rbs_type(e, receiver_type)
+          score += given.zip(expected).sum do |t, e|
+            e = from_rbs_type e, receiver_type
+            if intersect? t, e
+              1
+            elsif (intersect?(STRING, e) && t.methods.include?(:to_str)) || (intersect?(INTEGER, e) && t.methods.include?(:to_int)) || (intersect?(ARRAY, e) && t.methods.include?(:to_ary))
+              0.5
+            else
+              0
+            end
           end
         end
         [[method_type, given || [], expected || []], score]
@@ -83,14 +118,24 @@ module KatakataIrb::Types
     intersect.call(InstanceType, &:klass)
   end
 
-  def self.type_from_object(object, max_level: 4)
+  def self.type_from_object(object)
+    case object
+    when Array, Hash, Module
+      type_from_object_recursive(object, max_level: 4)
+    else
+      klass = object.singleton_class rescue object.class
+      InstanceType.new klass
+    end
+  end
+
+  def self.type_from_object_recursive(object, max_level:)
     max_level -= 1
     sample_size = 1000
     case object
     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_recursive(_1, max_level: max_level) }] }
       else
         InstanceType.new Array, { Elem: UnionType[*values.map(&:class).uniq.map { InstanceType.new _1 }] }
       end
@@ -98,8 +143,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_recursive(_1, max_level: max_level) }
+        value_types = values.map { type_from_object_recursive(_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,9 +165,11 @@ 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]
+    def nillable?() = false
+    def nonnillable() = self
   end
 
   class InstanceType
@@ -136,6 +183,8 @@ module KatakataIrb::Types
     def all_methods() = @klass.instance_methods | @klass.private_instance_methods
     def constants() = []
     def types() = [self]
+    def nillable?() = (@klass == NilClass)
+    def nonnillable() = self
   end
 
   class ProcType
@@ -150,11 +199,13 @@ module KatakataIrb::Types
     def all_methods() = Proc.instance_methods | Proc.private_instance_methods
     def constants() = []
     def types() = [self]
+    def nillable?() = (@klass == NilClass)
+    def nonnillable() = self
   end
 
   NIL = InstanceType.new NilClass
   OBJECT = InstanceType.new Object
-  TRUE = InstanceType.new FalseClass
+  TRUE = InstanceType.new TrueClass
   FALSE = InstanceType.new FalseClass
   SYMBOL = InstanceType.new Symbol
   STRING = InstanceType.new String
@@ -203,6 +254,14 @@ module KatakataIrb::Types
       UnionType[*types.map(&block)]
     end
 
+    def nillable?
+      types.any?(&:nillable?)
+    end
+
+    def nonnillable
+      UnionType[*types.reject { _1.is_a?(InstanceType) && _1.klass == NilClass }]
+    end
+
     def self.[](*types)
       type = new(*types)
       if type.types.empty?
@@ -219,6 +278,8 @@ module KatakataIrb::Types
     def constants() = @types.flat_map(&:constants).uniq
   end
 
+  BOOLEAN = UnionType[TRUE, FALSE]
+
   def self.from_rbs_type(return_type, self_type, extra_vars = {})
     case return_type
     when RBS::Types::Bases::Self
@@ -238,7 +299,7 @@ module KatakataIrb::Types
       end
       UnionType[*types]
     when RBS::Types::Bases::Bool
-      UnionType[TRUE, FALSE]
+      BOOLEAN
     when RBS::Types::Bases::Instance
       self_type.transform do |type|
         case type
@@ -286,7 +347,7 @@ module KatakataIrb::Types
       when :int
         INTEGER
       when :boolish
-        UnionType[TRUE, FALSE]
+        BOOLEAN
       when :string
         STRING
       else
@@ -297,19 +358,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
 
@@ -338,6 +393,25 @@ module KatakataIrb::Types
       end
     in [RBS::Types::Record, InstanceType] if value.klass == Hash
       # TODO
+    in [RBS::Types::Interface,]
+      definition = rbs_builder.build_interface rbs_type.name
+      convert = {}
+      definition.type_params.zip(rbs_type.args).each do |from, arg|
+        convert[from] = arg.name if arg.is_a? RBS::Types::Variable
+      end
+      return if convert.empty?
+      ac = {}
+      definition.methods.each do |method_name, method|
+        return_type = method_return_type value, method_name
+        method.defs.each do |method_def|
+          interface_return_type = method_def.type.type.return_type
+          _match_free_variable convert, interface_return_type, return_type, ac
+        end
+      end
+      convert.each do |from, to|
+        values = ac[from]
+        (accumulator[to] ||= []).concat values if values
+      end
     else
     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.5"
 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.5
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-04-14 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,11 @@ 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/scope.rb
 - lib/katakata_irb/type_simulator.rb
 - lib/katakata_irb/types.rb
 - lib/katakata_irb/version.rb
@@ -69,14 +75,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.6
 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