katakata_irb 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50fd34032f33c722cce1adc7118a354b2fdc31736f6d00d9557b9b72b361b65
-  data.tar.gz: b874b7a2b3f65a91eebd447df6df55ae931d8050418942fd07b453611d8ff509
+  metadata.gz: e03e0f334a22895540f29f3bb27551bff9bfcbede5aac767559006edbc77118f
+  data.tar.gz: 4db442409ca2ac1d853b4e7675ff3ac10aed0d6ced431d1abdbe2eea7a1fa298
 SHA512:
-  metadata.gz: c1d44c271e5ef109670345b8c85022553ab7618ffa30e4f979743912b30677fd8e9925d0b36c933d79f8aa0e7dc2be298e06db6f0a56cff442acb59b22ebc383
-  data.tar.gz: e64e94002296f792a6bdd9b5637f0bf065c4366de653eb15161b3bc9c7aca1598e880344f393106c0ce0e92497cd2d13ee1f604619b70ebe986090a8fa1e74a2
+  metadata.gz: fb7d8eae8b68d497c6e0c5c0d9bc8d8455d5af5638fb680b3048166188a1035a2e36229a7555203de4f8d18bc3089b92f441f496d6e2a074ad61587805b6de82
+  data.tar.gz: 75ef2f2f26505c98e3550342493474f47f11623fd1342f0529249e6e902e95f5ebf03f5053974c6813beee3697c0d13cb5a0adec073c65ece35dce9a3e3f01ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katakata_irb (0.1.7)
+    katakata_irb (0.1.8)
       irb (>= 1.4.0)
       rbs
 

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/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)

data/lib/katakata_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KatakataIrb
-  VERSION = "0.1.7"
+  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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb