katakata_irb 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df817c7e7806e6ea21aa82e14a694130b0db5dd68c74ea84790b90ad3b895fb7
-  data.tar.gz: 9faa1d72b27f35bccc5b4d2dcc5c9f50b4dd9946ba5d63374d3083e933e62c38
+  metadata.gz: e03e0f334a22895540f29f3bb27551bff9bfcbede5aac767559006edbc77118f
+  data.tar.gz: 4db442409ca2ac1d853b4e7675ff3ac10aed0d6ced431d1abdbe2eea7a1fa298
 SHA512:
-  metadata.gz: 9bec77d0fd1f9484278541e48a964c683ef2546b8a5b107e731d7979b634c4c8fb9ce2b68261603fc5f4ad8eb83cfb3018e11881a2ecd4096d268e7be0e97405
-  data.tar.gz: b6520a88ad8644423f24e7c02e783bf1cb388b3a00d2c16151b97e08598f1fd80f55f8346562d00c9d2ec0e2b619d4f4db23eeba5834c39b9ebfc72ce765cbdb
+  metadata.gz: fb7d8eae8b68d497c6e0c5c0d9bc8d8455d5af5638fb680b3048166188a1035a2e36229a7555203de4f8d18bc3089b92f441f496d6e2a074ad61587805b6de82
+  data.tar.gz: 75ef2f2f26505c98e3550342493474f47f11623fd1342f0529249e6e902e95f5ebf03f5053974c6813beee3697c0d13cb5a0adec073c65ece35dce9a3e3f01ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katakata_irb (0.1.6)
+    katakata_irb (0.1.8)
       irb (>= 1.4.0)
       rbs
 
@@ -9,12 +9,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     io-console (0.6.0)
-    irb (1.6.2)
+    irb (1.6.4)
       reline (>= 0.3.0)
-    minitest (5.16.3)
+    minitest (5.18.0)
     rake (13.0.6)
-    rbs (2.7.0)
-    reline (0.3.2)
+    rbs (3.1.0)
+    reline (0.3.3)
       io-console (~> 0.5)
 
 PLATFORMS

data/README.md

@@ -10,8 +10,10 @@ gem install katakata_irb
 ## Usage
 
 Just require katakata_irb or write it to your `.irbrc` file.
+
 ```ruby
-require 'katakata_irb'
+# .irbrc
+require 'katakata_irb' rescue nil
 ```
 
 ```

data/lib/katakata_irb/completor.rb

@@ -120,10 +120,9 @@ module KatakataIrb::Completor
       contents = types.filter_map do |type|
         case type
         when KatakataIrb::Types::InstanceType
-          KatakataIrb::Types.class_name_of type.klass
-        when KatakataIrb::Types::SingletonType
-          module_name = KatakataIrb::Types.class_name_of type.module_or_class
-          "#{module_name}.itself" if module_name
+          type.inspect_without_params
+        else
+          type.inspect
         end
       end.uniq
       return if contents.empty?
@@ -247,7 +246,7 @@ module KatakataIrb::Completor
       # `require 'target'`
       return [require_method.to_sym, name.rstrip]
     end
-    if (target in [:@ident,]) && (expression in [:symbol,]) && (parents[-2] in [:args_add_block, Array => args, [:symbol_literal, ^expression]])
+    if (target in [:@ident,]) && (expression in [:symbol,]) && (parents[-2] in [:args_add_block, Array => _args, [:symbol_literal, ^expression]])
       # `method(&:target)`
       receiver_ref = [:var_ref, [:@ident, '_1', [0, 0]]]
       block_statements = [receiver_ref]

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
@@ -77,7 +80,12 @@ module KatakataIrb
       when :lvar
         @local_variables.include? name
       when :const
-        @binding.eval("#{name};true") rescue false
+        begin
+          @binding.eval(name)
+          true
+        rescue
+          false
+        end
       when :gvar, :cvar, :ivar
         true
       when :internal

data/lib/katakata_irb/type_simulator.rb

@@ -707,13 +707,12 @@ class KatakataIrb::TypeSimulator
 
   def evaluate_massign(sexp, values, scope)
     values = sized_splat values, :to_ary, sexp.size unless values.is_a? Array
-
     rest_index = sexp.find_index { _1 in [:rest_param, ]}
     if rest_index
       pre = rest_index ? sexp[0...rest_index] : sexp
       post = rest_index ? sexp[rest_index + 1..] : []
       sexp[rest_index] in [:rest_param, rest_field]
-      rest_values = values[pre.size...-post.size] || []
+      rest_values = values[pre.size...values.size - post.size] || []
       rest_type = KatakataIrb::Types::InstanceType.new Array, Elem: KatakataIrb::Types::UnionType[*rest_values]
       pairs = pre.zip(values.first(pre.size)) + [[rest_field, rest_type]] + post.zip(values.last(post.size))
     else

data/lib/katakata_irb/types.rb

@@ -12,7 +12,7 @@ module KatakataIrb::Types
     loader.add path: Pathname('sig')
     RBS::DefinitionBuilder.new env: RBS::Environment.from_loader(loader).resolve_type_names
   rescue => e
-    puts "\nKatakataIRB failed to initialize RBS::DefinitionBuild\n#{e}"
+    puts "\r\nKatakataIRB failed to initialize RBS::DefinitionBuilder\r\n#{e}\r\n"
     Object.new
   end
 
@@ -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)
@@ -196,16 +193,22 @@ module KatakataIrb::Types
     def nillable?() = (@klass == NilClass)
     def nonnillable() = self
     def inspect
-      case klass
-      when NilClass
+      if params.empty?
+        inspect_without_params
+      else
+        params_string = "[#{params.map { "#{_1}: #{_2.inspect}" }.join(', ')}]"
+        "#{inspect_without_params}#{params_string}"
+      end
+    end
+    def inspect_without_params
+      if klass == NilClass
         'nil'
-      when TrueClass
+      elsif klass == TrueClass
         'true'
-      when FalseClass
+      elsif klass == FalseClass
         'false'
       else
-        params_string = "[#{params.map { "#{_1}: #{_2.inspect}" }.join(', ')}]" unless params.empty?
-        "#{klass.name}#{params_string}"
+        klass.singleton_class? ? klass.superclass.to_s : klass.to_s
       end
     end
   end
@@ -327,18 +330,10 @@ module KatakataIrb::Types
       BOOLEAN
     when RBS::Types::Bases::Instance
       self_type.transform do |type|
-        case type
-        in SingletonClass
-          InstanceType.new type.klass
-        in InstanceType
-          case type.klass
-          in Class
-            InstanceType.new Class
-          in Module
-            InstanceType.new Module
-          else
-            OBJECT
-          end
+        if type.is_a?(SingletonType) && type.module_or_class.is_a?(Class)
+          InstanceType.new type.module_or_class
+        else
+          OBJECT
         end
       end
     when RBS::Types::Union

data/lib/katakata_irb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb