katakata_irb 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50fd34032f33c722cce1adc7118a354b2fdc31736f6d00d9557b9b72b361b65
-  data.tar.gz: b874b7a2b3f65a91eebd447df6df55ae931d8050418942fd07b453611d8ff509
+  metadata.gz: ce4d7b2e5ebfc546ddb501c43c13c62b166a55dc34a215a460d560b946ad4f02
+  data.tar.gz: f23396dc9804a798d109342d063943da759139fd849fd828f85d51f71089d5e7
 SHA512:
-  metadata.gz: c1d44c271e5ef109670345b8c85022553ab7618ffa30e4f979743912b30677fd8e9925d0b36c933d79f8aa0e7dc2be298e06db6f0a56cff442acb59b22ebc383
-  data.tar.gz: e64e94002296f792a6bdd9b5637f0bf065c4366de653eb15161b3bc9c7aca1598e880344f393106c0ce0e92497cd2d13ee1f604619b70ebe986090a8fa1e74a2
+  metadata.gz: 5e44f1dbab26c56949e89053a0309ad9f3195a8f545ea95b546a541c547b55b86a69afb3944bdbfeb5e498a62105cb2f54630e559b32188b2532cfa4625ee765
+  data.tar.gz: 9beaaf9996eba51111cabc5a1ba4082f94657ecdeb06b3cf1c0859c346822d772134673d190639b874caacf3f220c19d8ac8ad150c2c98f85129e658a58a2b95

data/katakata_irb.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency 'irb', '>= 1.4.0'
+  spec.add_dependency 'reline', '>= 0.3.0'
   spec.add_dependency 'rbs'
 
   # For more information and examples about making a new gem, check out our

data/lib/katakata_irb/completor.rb

@@ -54,9 +54,9 @@ module KatakataIrb::Completor
     IRB::InputCompletor::CompletionProc.define_singleton_method :call do |*args|
       completion_proc.call(*args)
     rescue => e
-      $error = e
+      KatakataIrb.last_completion_error = e
       KatakataIrb.log_puts
-      KatakataIrb.log_puts "#{e.inspect} stored to $error"
+      KatakataIrb.log_puts "#{e.inspect} stored to KatakataIrb.last_completion_error"
       KatakataIrb.log_puts
     end
 
@@ -130,7 +130,8 @@ module KatakataIrb::Completor
       width = contents.map { Reline::Unicode.calculate_width _1 }.max
       x = cursor_pos_to_render.x + autocomplete_dialog.width
       y = cursor_pos_to_render.y
-      Reline::DialogRenderInfo.new(pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: 44, fg_color: 37)
+      info = { pos: Reline::CursorPos.new(x, y), contents: contents, width: width, bg_color: 44, fg_color: 37 }
+      Reline::DialogRenderInfo.new(**info.slice(*Reline::DialogRenderInfo.members))
     }
     Reline.add_dialog_proc(:show_type, type_dialog_proc, Reline::DEFAULT_DIALOG_CONTEXT)
   end
@@ -233,7 +234,9 @@ module KatakataIrb::Completor
     in_class_module = parents&.any? { _1 in [:class | :module,] }
     icvar_available = !in_class_module
     return unless target in [_type, String, [Integer, Integer]]
-    if target in [:@ivar,]
+    if target in [:@gvar,]
+      return [:gvar, name]
+    elsif target in [:@ivar,]
       return [:ivar, name] if icvar_available
     elsif target in [:@cvar,]
       return [:cvar, name] if icvar_available
@@ -275,12 +278,13 @@ module KatakataIrb::Completor
       [:const, calculate_receiver.call(receiver), name]
     in [:top_const_ref, [:@const,]]
       [:const, KatakataIrb::Types::SingletonType.new(Object), name]
-    in [:def,] | [:string_content,] | [:var_field,] | [:defs,] | [:rest_param,] | [:kwrest_param,] | [:blockarg,] | [[:@ident,],]
+    in [:def,] | [:string_content,] | [:field | :var_field | :const_path_field,] | [:defs,] | [:rest_param,] | [:kwrest_param,] | [:blockarg,] | [[:@ident,],]
     in [Array,] # `xstring`, /regexp/
     else
       KatakataIrb.log_puts
-      KatakataIrb.log_puts [:NEW_EXPRESSION, expression].inspect
+      KatakataIrb.log_puts [:UNIMPLEMENTED_EXPRESSION, expression].inspect
       KatakataIrb.log_puts
+      nil
     end
   end
 

data/lib/katakata_irb/scope.rb

@@ -14,6 +14,7 @@ module KatakataIrb
       @binding, @self_object = binding, self_object
       @cache = { SELF => KatakataIrb::Types.type_from_object(self_object) }
       @local_variables = binding.local_variables.map(&:to_s).to_set
+      @global_variables = global_variables.map(&:to_s).to_set
     end
 
     def level() = 0
@@ -36,6 +37,8 @@ module KatakataIrb
           BaseScope.type_of(fallback: fallback) { @binding.local_variable_get(name) }
         when :const
           BaseScope.type_of(fallback: fallback) { @binding.eval name }
+        when :gvar
+          BaseScope.type_of(fallback: fallback) { @binding.eval name if @global_variables.include? name }
         end
       )
     end

data/lib/katakata_irb/type_simulator.rb

@@ -80,6 +80,7 @@ class KatakataIrb::TypeSimulator
       end
       if @dig_targets.dig? sexp
         params in [:paren, params]
+        params ||= [:params, nil, nil, nil, nil, nil, nil, nil] # params might be nil in ruby 3.0
         params_table = extract_param_names(params).to_h { [_1, KatakataIrb::Types::NIL] }
         method_scope = KatakataIrb::Scope.new(
           scope,
@@ -556,7 +557,7 @@ class KatakataIrb::TypeSimulator
       scope.update pattern_scope
       KatakataIrb::Types::UnionType[*results]
     in [:case, target_exp, match_exp]
-      target = simulate_evaluate target_exp, scope
+      target = target_exp ? simulate_evaluate(target_exp, scope) : KatakataIrb::Types::NIL
       simulate_evaluate match_exp, scope, case_target: target
     in [:void_stmt]
       KatakataIrb::Types::NIL
@@ -894,6 +895,7 @@ class KatakataIrb::TypeSimulator
       in [:field | :aref_field,]
         # a.b, c[i] = value
       in [:excessed_comma]
+      in [:args_forward]
       end
     end
     [*pre_required, *post_required].each(&extract_mlhs)

data/lib/katakata_irb/types.rb

@@ -95,15 +95,11 @@ module KatakataIrb::Types
             given << UnionType[*centers.drop(opts.size)]
             expected << rest.type
           end
-          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
+          if given.any?
+            score += given.zip(expected).count do |t, e|
+              e = from_rbs_type e, receiver_type
+              intersect?(t, e) || (intersect?(STRING, e) && t.methods.include?(:to_str)) || (intersect?(INTEGER, e) && t.methods.include?(:to_int)) || (intersect?(ARRAY, e) && t.methods.include?(:to_ary))
+            end.fdiv(given.size)
           end
         end
         [[method_type, given || [], expected || []], score]
@@ -114,15 +110,16 @@ module KatakataIrb::Types
   end
 
   def self.intersect?(a, b)
-    atypes = ((a in UnionType) ? a.types : [a]).group_by(&:class)
-    btypes = ((b in UnionType) ? b.types : [b]).group_by(&:class)
-    intersect = ->(type, &block) do
-      aa, bb = [atypes, btypes].map {|types| (types[type] || []).map(&block) }
-      (aa & bb).any?
-    end
+    atypes = a.types.group_by(&:class)
+    btypes = b.types.group_by(&:class)
     return true if atypes[ProcType] && btypes[ProcType]
-    return true if intersect.call(SingletonType, &:module_or_class)
-    intersect.call(InstanceType, &:klass)
+    if atypes[SingletonType] && btypes[SingletonType]
+      aa, bb = [atypes, btypes].map {|types| types[SingletonType].map(&:module_or_class) }
+      return true if (aa & bb).any?
+    end
+
+    aa, bb = [atypes, btypes].map {|types| (types[InstanceType] || []).map(&:klass) }
+    (aa.flat_map(&:ancestors) & bb).any?
   end
 
   def self.type_from_object(object)
@@ -189,12 +186,19 @@ module KatakataIrb::Types
       @params = params
     end
     def transform() = yield(self)
-    def methods() = @klass.instance_methods
-    def all_methods() = @klass.instance_methods | @klass.private_instance_methods
+    def methods() = rbs_methods.select { _2.public? }.keys | @klass.instance_methods
+    def all_methods() = rbs_methods.keys | @klass.instance_methods | @klass.private_instance_methods
     def constants() = []
     def types() = [self]
     def nillable?() = (@klass == NilClass)
     def nonnillable() = self
+    def rbs_methods
+      name = KatakataIrb::Types.class_name_of(@klass)
+      return {} unless name
+
+      type_name = RBS::TypeName(name).absolute!
+      KatakataIrb::Types.rbs_builder.build_instance(type_name).methods rescue {}
+    end
     def inspect
       if params.empty?
         inspect_without_params

data/lib/katakata_irb/version.rb

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

data/lib/katakata_irb.rb

@@ -2,12 +2,15 @@ require 'katakata_irb/version'
 require 'katakata_irb/completor'
 
 module KatakataIrb
-  def self.log_output=(output)
-    @log_output = output
-  end
-
-  def self.log_puts(...)
-    STDOUT.cooked { @log_output&.puts(...) }
+  class << self
+    attr_accessor :log_output, :last_completion_error
+    def log_puts(...)
+      if STDOUT.tty?
+        STDOUT.cooked { log_output&.puts(...) }
+      else
+        log_output&.puts(...)
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    katakata_irb (0.1.7)
-      irb (>= 1.4.0)
-      rbs
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    io-console (0.6.0)
-    irb (1.6.4)
-      reline (>= 0.3.0)
-    minitest (5.18.0)
-    rake (13.0.6)
-    rbs (3.1.0)
-    reline (0.3.3)
-      io-console (~> 0.5)
-
-PLATFORMS
-  x86_64-darwin-20
-
-DEPENDENCIES
-  katakata_irb!
-  minitest (~> 5.0)
-  rake (~> 13.0)
-
-BUNDLED WITH
-   2.4.5