katakata_irb 0.2.0 → 0.2.2

data/lib/katakata_irb/types.rb

@@ -16,7 +16,7 @@ module KatakataIrb::Types
     loader = RBS::CLI::LibraryOptions.new.loader
     loader.add path: Pathname('sig')
     RBS::DefinitionBuilder.new env: RBS::Environment.from_loader(loader).resolve_type_names
-  rescue => e
+  rescue LoadError, StandardError => e
     @rbs_load_error = e
     puts "\r\nKatakataIRB failed to initialize RBS::DefinitionBuilder: #{e.class}\r\n"
     puts "See `KatakataIrb::Types.rbs_load_error` for more details.\r\n"
@@ -35,7 +35,7 @@ module KatakataIrb::Types
   def self.rbs_search_method(klass, method_name, singleton)
     klass.ancestors.each do |ancestor|
       name = class_name_of ancestor
-      next unless name
+      next unless name && rbs_builder
       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] if definition
@@ -47,8 +47,6 @@ module KatakataIrb::Types
   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
@@ -70,15 +68,13 @@ module KatakataIrb::Types
 
     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
-    has_splat = args_types.any? { _1 in Splat }
+    has_splat = args_types.any? { _1.is_a? Splat }
     methods_with_score = receivers.flat_map do |receiver_type, klass, singleton|
       method = rbs_search_method klass, method_name, singleton
       next [] unless method
@@ -98,7 +94,7 @@ module KatakataIrb::Types
           args += [InstanceType.new(Hash, K: SYMBOL, V: kw_value_type)]
         end
         if has_splat
-          score += 1 if args.count { !(_1 in Splat) } <= reqs.size + opts.size + trailings.size
+          score += 1 if args.count { !(_1.is_a? Splat) } <= reqs.size + opts.size + trailings.size
         elsif reqs.size + trailings.size <= args.size && (rest || args.size <= reqs.size + opts.size + trailings.size)
           score += 2
           centers = args[reqs.size...-trailings.size]
@@ -125,7 +121,6 @@ module KatakataIrb::Types
   def self.intersect?(a, b)
     atypes = a.types.group_by(&:class)
     btypes = b.types.group_by(&:class)
-    return true if atypes[ProcType] && btypes[ProcType]
     if atypes[SingletonType] && btypes[SingletonType]
       aa, bb = [atypes, btypes].map {|types| types[SingletonType].map(&:module_or_class) }
       return true if (aa & bb).any?
@@ -207,7 +202,7 @@ module KatakataIrb::Types
     def nonnillable() = self
     def rbs_methods
       name = KatakataIrb::Types.class_name_of(@klass)
-      return {} unless name
+      return {} unless name && KatakataIrb::Types.rbs_builder
 
       type_name = RBS::TypeName(name).absolute!
       KatakataIrb::Types.rbs_builder.build_instance(type_name).methods rescue {}
@@ -233,23 +228,6 @@ module KatakataIrb::Types
     end
   end
 
-  class ProcType
-    attr_reader :params, :kwparams, :return_type
-    def initialize(params = [], kwparams = {}, return_type = NIL)
-      @params = params
-      @kwparams = kwparams
-      @return_type = return_type
-    end
-    def transform() = yield(self)
-    def methods() = Proc.instance_methods
-    def all_methods() = Proc.instance_methods | Proc.private_instance_methods
-    def constants() = []
-    def types() = [self]
-    def nillable?() = (@klass == NilClass)
-    def nonnillable() = self
-    def inspect() = 'Proc'
-  end
-
   NIL = InstanceType.new NilClass
   OBJECT = InstanceType.new Object
   TRUE = InstanceType.new TrueClass
@@ -266,7 +244,7 @@ module KatakataIrb::Types
   HASH = InstanceType.new Hash
   CLASS = InstanceType.new Class
   MODULE = InstanceType.new Module
-  PROC = ProcType.new
+  PROC = InstanceType.new Proc
 
   class UnionType
     attr_reader :types
@@ -275,7 +253,6 @@ module KatakataIrb::Types
       @types = []
       singletons = []
       instances = {}
-      procs = []
       collect = -> type do
         case type
         in UnionType
@@ -287,12 +264,10 @@ module KatakataIrb::Types
           end
         in SingletonType
           singletons << type
-        in ProcType
-          procs << type
         end
       end
       types.each(&collect)
-      @types = procs.uniq + singletons.uniq + instances.map do |klass, params|
+      @types = singletons.uniq + instances.map do |klass, params|
         InstanceType.new(klass, params.transform_values { |v| UnionType[*v] })
       end
     end
@@ -364,7 +339,7 @@ module KatakataIrb::Types
     when RBS::Types::Union
       UnionType[*return_type.types.map { from_rbs_type _1, self_type, extra_vars }]
     when RBS::Types::Proc
-      InstanceType.new Proc
+      PROC
     when RBS::Types::Tuple
       elem = UnionType[*return_type.types.map { from_rbs_type _1, self_type, extra_vars }]
       InstanceType.new Array, Elem: elem
@@ -375,11 +350,11 @@ module KatakataIrb::Types
     when RBS::Types::Variable
       if extra_vars.key? return_type.name
         extra_vars[return_type.name]
-      elsif self_type in InstanceType
+      elsif self_type.is_a? InstanceType
         self_type.params[return_type.name] || OBJECT
-      elsif self_type in UnionType
+      elsif self_type.is_a? UnionType
         types = self_type.types.filter_map do |t|
-          t.params[return_type.name] if t in InstanceType
+          t.params[return_type.name] if t.is_a? InstanceType
         end
         UnionType[*types]
       else

data/lib/katakata_irb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ files:
 - lib/katakata_irb.rb
 - lib/katakata_irb/completor.rb
 - lib/katakata_irb/scope.rb
-- lib/katakata_irb/type_simulator.rb
+- lib/katakata_irb/type_analyzer.rb
 - lib/katakata_irb/types.rb
 - lib/katakata_irb/version.rb
 - sig/katakata_irb.rbs