repl_type_completor 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96985b2dccd9d5437190f365bb6b367a4dd830cbf35c9542825b340f4d833f70
-  data.tar.gz: 53d2a4f5ef5d01b2f1626d978a385bc74d44472ff69f04fc9975b2669226a775
+  metadata.gz: 22c32aa7e27069f8002c1fe8080bb31c8470760c6c780ba8b566252389dc326d
+  data.tar.gz: 296c548b10082570baadd90d3c94323f91373a6f0edbde307d01228aac7d83e0
 SHA512:
-  metadata.gz: 61535de8984acd5d7bc82b0c93e41dac60b5e43dcf4606666f0c7df491e685c39a983cf5dfac80e368ce20e77e2211242db9e172596dfa1111f67fb9a17bdb47
-  data.tar.gz: 54c7e6900a693254db6e2d462a9b14f0cef5e514581227c2c39b1d13841fea88591f4504037b02edfe6aa1971d3ebdb9e678d735a277d98cebb6df7d372f00fb
+  metadata.gz: 3494ca3dfd41ac33f784e35384299a502703e503fc94732a7572cf2c4418d7754b53dfb2be49588aca33eab595dc3ed181686b4cfc32da0a36c6523aa82183c9
+  data.tar.gz: 4beada48ab3e6d67c7543cf9a3e7797792fef8548cf4a8637024d72b865dcbb50ace5fe460ff8e504dae73e308116aefa523fdcbf4f161ed534060fa9c700e59

data/lib/repl_type_completor/result.rb

@@ -139,29 +139,37 @@ module ReplTypeCompletor
       type = type.types.find { _1.all_methods.include? name.to_sym }
       case type
       when Types::SingletonType
-        "#{Types.class_name_of(type.module_or_class)}.#{name}"
+        "#{doc_class_module_name(type.module_or_class)}.#{name}"
       when Types::InstanceType
-        "#{Types.class_name_of(type.klass)}##{name}"
+        "#{doc_class_module_name(type.klass)}##{name}"
       end
     end
 
     def call_or_const_doc(type, name)
       if name =~ /\A[A-Z]/
         type = type.types.grep(Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
-        type.module_or_class == Object ? name : "#{Types.class_name_of(type.module_or_class)}::#{name}" if type
+        type.module_or_class == Object ? name : "#{doc_class_module_name(type.module_or_class)}::#{name}" if type
       else
         method_doc(type, name)
       end
     end
 
+    def doc_class_module_name(module_or_class)
+      if Class === module_or_class
+        Types.class_name_of(module_or_class)
+      else
+        Methods::MODULE_NAME_METHOD.bind_call(module_or_class) || 'Module'
+      end
+    end
+
     def value_doc(type)
       return unless type
       type.types.each do |t|
         case t
         when Types::SingletonType
-          return Types.class_name_of(t.module_or_class)
+          return doc_class_module_name(t.module_or_class)
         when Types::InstanceType
-          return Types.class_name_of(t.klass)
+          return doc_class_module_name(t.klass)
         end
       end
       nil

data/lib/repl_type_completor/type_analyzer.rb

@@ -9,13 +9,13 @@ module ReplTypeCompletor
   class TypeAnalyzer
     class DigTarget
       def initialize(parents, receiver, &block)
-        @dig_ids = parents.to_h { [_1.__id__, true] }
-        @target_id = receiver.__id__
+        @dig_nodes = parents.to_h { [_1, true] }.compare_by_identity
+        @target = receiver
         @block = block
       end
 
-      def dig?(node) = @dig_ids[node.__id__]
-      def target?(node) = @target_id == node.__id__
+      def dig?(node) = @dig_nodes[node]
+      def target?(node) = @target.equal?(node)
       def resolve(type, scope)
         @block.call type, scope
       end
@@ -259,6 +259,9 @@ module ReplTypeCompletor
           call_block_proc = ->(block_args, block_self_type) do
             scope.conditional do |s|
               params_table = node.block.locals.to_h { [_1.to_s, Types::NIL] }
+              if node.block.parameters.is_a?(Prism::ItParametersNode)
+                params_table['_1'] = block_args.first || Types::NIL
+              end
               table = { **params_table, Scope::BREAK_RESULT => nil, Scope::NEXT_RESULT => nil }
               block_scope = Scope.new s, table, self_type: block_self_type, trace_ivar: !block_self_type
               # TODO kwargs
@@ -266,9 +269,9 @@ module ReplTypeCompletor
               when Prism::NumberedParametersNode
                 assign_numbered_parameters node.block.parameters.maximum, block_scope, block_args, {}
               when Prism::BlockParametersNode
-                assign_parameters node.block.parameters.parameters, block_scope, block_args, {}
-              when Prism::ItParametersNode
-                scope['_1'] = block_args.first || Types::NIL
+                if node.block.parameters.parameters
+                  assign_parameters node.block.parameters.parameters, block_scope, block_args, {}
+                end
               end
               result = node.block.body ? evaluate(node.block.body, block_scope) : Types::NIL
               block_scope.merge_jumps
@@ -447,6 +450,10 @@ module ReplTypeCompletor
       Types::PROC
     end
 
+    def evaluate_shareable_constant_node(node, scope)
+      evaluate(node.write, scope)
+    end
+
     def evaluate_reference_write(node, scope)
       scope[node.name.to_s] = evaluate node.value, scope
     end
@@ -817,7 +824,7 @@ module ReplTypeCompletor
     def evaluate_call_node_arguments(call_node, scope)
       # call_node.arguments is Prism::ArgumentsNode
       arguments = call_node.arguments&.arguments&.dup || []
-      block_arg = call_node.block.expression if call_node.block.is_a?(Prism::BlockArgumentNode)
+      block_arg = call_node.block.expression if call_node.respond_to?(:block) && call_node.block.is_a?(Prism::BlockArgumentNode)
       kwargs = arguments.pop.elements if arguments.last.is_a?(Prism::KeywordHashNode)
       args_types = arguments.map do |arg|
         case arg
@@ -1093,7 +1100,6 @@ module ReplTypeCompletor
             end
           end
         end
-        evaluate node.block.expression, scope if node.block&.expression
         receiver
       when Prism::SplatNode
         evaluate_multi_write_receiver node.expression, scope, evaluated_receivers if node.expression

data/lib/repl_type_completor/types.rb

@@ -53,15 +53,32 @@ module ReplTypeCompletor
     end
 
     def self.class_name_of(klass)
-      klass = klass.superclass if klass.singleton_class?
-      Methods::MODULE_NAME_METHOD.bind_call klass
+      while true
+        name = Methods::MODULE_NAME_METHOD.bind_call klass
+        return name if name
+
+        klass = klass.superclass
+      end
+    end
+
+    if RBS::TypeName.respond_to?(:parse) # RBS >= 3.8.0
+      def self.rbs_absolute_type_name(name)
+        RBS::TypeName.parse(name).absolute!
+      end
+    else
+      def self.rbs_absolute_type_name(name)
+        # Deprecated in RBS 3.8.0
+        RBS::TypeName(name).absolute!
+      end
     end
 
     def self.rbs_search_method(klass, method_name, singleton)
+      return unless rbs_builder
+
       klass.ancestors.each do |ancestor|
-        name = class_name_of ancestor
-        next unless name && rbs_builder
-        type_name = RBS::TypeName(name).absolute!
+        next unless (name = Methods::MODULE_NAME_METHOD.bind_call(ancestor))
+
+        type_name = rbs_absolute_type_name(name)
         definition = (singleton ? rbs_builder.build_singleton(type_name) : rbs_builder.build_instance(type_name)) rescue nil
         method = definition.methods[method_name] if definition
         return method if method
@@ -208,10 +225,10 @@ module ReplTypeCompletor
       def nillable?() = (@klass == NilClass)
       def nonnillable() = self
       def rbs_methods
-        name = Types.class_name_of(@klass)
-        return {} unless name && Types.rbs_builder
+        return {} unless Types.rbs_builder
 
-        type_name = RBS::TypeName(name).absolute!
+        name = Types.class_name_of(@klass)
+        type_name = Types.rbs_absolute_type_name(name)
         Types.rbs_builder.build_instance(type_name).methods rescue {}
       end
       def inspect

data/lib/repl_type_completor/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: repl_type_completor
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - tompng
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -71,7 +70,6 @@ metadata:
   homepage_uri: https://github.com/ruby/repl_type_completor
   source_code_uri: https://github.com/ruby/repl_type_completor
   documentation_uri: https://github.com/ruby/repl_type_completor
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Type based completion for REPL.
 test_files: []