repl_type_completor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a82aeb5a01426335efe986d61dcb745051091bc6dedc93d332cf6bacaa0351
-  data.tar.gz: 6b669b71a1d01fb394e0bb2ec8776bb3d68ecade407ed6fbb36f87400cba4fae
+  metadata.gz: 201cdeb4768937fdb0d5639e6547ec9d6bcf57ac10ea7eb031059b41dea1ac00
+  data.tar.gz: d4dcf563c39cfe91cbb6a74a155b384eaf61048c09e809b473830075be73df18
 SHA512:
-  metadata.gz: 03b215d8f2123c52047513e321b30f8d32159f318ca233b10de48df5b53ba04223b979024afe8d44d7e2a0e6f78595d2b4c4354f23fa90e3aae4f7b5de83e4bf
-  data.tar.gz: 879d342d1b77f30ebdc328ce1a4dc2cc4dc60d7179c7d2af384ae236d4b7e830c410d3c78c8750c70f4ea06b6612417cae26d9b18deb5b11d609be29798f5c34
+  metadata.gz: 824b42a6ea9408e8be0f10605f25f8435593bf275d4d0e4d024e0c41ffa449212597f79e55a178bf55b70290a51b99baff426aa134eba3a597d3e251ac8f10c4
+  data.tar.gz: 243b30a33e778cf36d9573af2a1c9deb862960d312a49476d9745d0f64031e30b1d632042545ab471b062a49f1ff056e5734f3eeaf69e9eb568304ceb2637636

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in repl_type_completor.gemspec
 gemspec
 
+gem 'irb', '>= 1.10.0'
 gem 'rake', '~> 13.0'
 gem 'test-unit'
 gem 'test-unit-ruby-core'

data/README.md

@@ -5,15 +5,13 @@ It uses RBS type information, performs static type analytics, uses dynamic runti
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
 Install the gem and add to the application's Gemfile by executing:
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+    $ bundle add repl_type_completor
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+    $ gem install repl_type_completor
 
 ## Usage
 

data/lib/repl_type_completor/result.rb

@@ -4,7 +4,13 @@ require_relative 'require_paths'
 
 module ReplTypeCompletor
   class Result
-    HIDDEN_METHODS = %w[Namespace TypeName] # defined by rbs, should be hidden
+    OPERATOR_METHODS = %w[! != !~ % & * ** + +@ - -@ / < << <= <=> == === =~ > >= >> [] []= ^ ` | ~]
+    HIDDEN_METHODS = [
+      # defined by RBS, should be hidden
+      'Namespace', 'TypeName',
+      # operator methods does not need to be completed
+      *OPERATOR_METHODS
+    ]
     RESERVED_WORDS = %w[
       __ENCODING__ __LINE__ __FILE__
       BEGIN END

data/lib/repl_type_completor/type_analyzer.rb

@@ -231,7 +231,6 @@ module ReplTypeCompletor
 
 
     def evaluate_call_node(node, scope)
-      is_field_assign = node.name.match?(/[^<>=!\]]=\z/) || (node.name == :[]= && !node.call_operator)
       receiver_type = node.receiver ? evaluate(node.receiver, scope) : scope.self_type
       evaluate_method = lambda do |scope|
         args_types, kwargs_types, block_sym_node, has_block = evaluate_call_node_arguments node, scope
@@ -254,16 +253,15 @@ module ReplTypeCompletor
         elsif node.block.is_a? Prism::BlockNode
           call_block_proc = ->(block_args, block_self_type) do
             scope.conditional do |s|
-              numbered_parameters = node.block.locals.grep(/\A_[1-9]/).map(&:to_s)
               params_table = node.block.locals.to_h { [_1.to_s, Types::NIL] }
               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
-              if node.block.parameters&.parameters
-                # node.block.parameters is Prism::BlockParametersNode
+              case node.block.parameters
+              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, {}
-              elsif !numbered_parameters.empty?
-                assign_numbered_parameters numbered_parameters, block_scope, block_args, {}
               end
               result = node.block.body ? evaluate(node.block.body, block_scope) : Types::NIL
               block_scope.merge_jumps
@@ -281,7 +279,7 @@ module ReplTypeCompletor
           call_block_proc = ->(_block_args, _self_type) { Types::OBJECT }
         end
         result = method_call receiver_type, node.name, args_types, kwargs_types, call_block_proc, scope
-        if is_field_assign
+        if node.attribute_write?
           args_types.last || Types::NIL
         else
           result
@@ -583,8 +581,8 @@ module ReplTypeCompletor
           case node.reference
           when Prism::LocalVariableTargetNode, Prism::InstanceVariableTargetNode, Prism::ClassVariableTargetNode, Prism::GlobalVariableTargetNode, Prism::ConstantTargetNode
             s[node.reference.name.to_s] = error_type
-          when Prism::CallNode
-            evaluate node.reference, s
+          when Prism::CallTargetNode, Prism::IndexTargetNode
+            evaluate_multi_write_receiver node.reference, s, nil
           end
         end
         node.statements ? evaluate(node.statements, s) : Types::NIL
@@ -904,7 +902,6 @@ module ReplTypeCompletor
       args = sized_splat(args.first, :to_ary, size) if size >= 2 && args.size == 1
       reqs = args.shift node.requireds.size
       if node.rest
-        # node.rest is Prism::RestParameterNode
         posts = []
         opts = args.shift node.optionals.size
         rest = args
@@ -925,8 +922,8 @@ module ReplTypeCompletor
       node.posts.zip posts do |n, v|
         assign_required_parameter n, v, scope
       end
-      if node.rest&.name
-        # node.rest is Prism::RestParameterNode
+      # Prism::ImplicitRestNode (tap{|a,|}) does not have a name
+      if node.rest.is_a?(Prism::RestParameterNode) && node.rest.name
         scope[node.rest.name.to_s] = Types.array_of(*rest)
       end
       node.keywords.each do |n|
@@ -946,16 +943,13 @@ module ReplTypeCompletor
       end
     end
 
-    def assign_numbered_parameters(numbered_parameters, scope, args, _kwargs)
-      return if numbered_parameters.empty?
-      max_num = numbered_parameters.map { _1[1].to_i }.max
-      if max_num == 1
+    def assign_numbered_parameters(maximum, scope, args, _kwargs)
+      if maximum == 1
         scope['_1'] = args.first || Types::NIL
       else
-        args = sized_splat(args.first, :to_ary, max_num) if args.size == 1
-        numbered_parameters.each do |name|
-          index = name[1].to_i - 1
-          scope[name] = args[index] || Types::NIL
+        args = sized_splat(args.first, :to_ary, maximum) if args.size == 1
+        maximum.times do |index|
+          scope["_#{index + 1}"] = args[index] || Types::NIL
         end
       end
     end
@@ -1038,8 +1032,8 @@ module ReplTypeCompletor
       case node
       when Prism::MultiTargetNode
         evaluate_multi_write node, value, scope, evaluated_receivers
-      when Prism::CallNode
-        evaluated_receivers&.[](node.receiver) || evaluate(node.receiver, scope) if node.receiver
+      when Prism::CallTargetNode, Prism::IndexTargetNode
+        evaluated_receivers&.[](node.receiver) || evaluate_multi_write_receiver(node, scope, nil)
       when Prism::SplatNode
         evaluate_write node.expression, Types.array_of(value), scope, evaluated_receivers if node.expression
       when Prism::LocalVariableTargetNode, Prism::GlobalVariableTargetNode, Prism::InstanceVariableTargetNode, Prism::ClassVariableTargetNode, Prism::ConstantTargetNode
@@ -1047,7 +1041,6 @@ module ReplTypeCompletor
       when Prism::ConstantPathTargetNode
         receiver = evaluated_receivers&.[](node.parent) || evaluate(node.parent, scope) if node.parent
         const_path_write receiver, node.child.name.to_s, value, scope
-        value
       end
     end
 
@@ -1070,20 +1063,24 @@ module ReplTypeCompletor
       when Prism::MultiWriteNode, Prism::MultiTargetNode
         targets = [*node.lefts, *node.rest, *node.rights]
         targets.each { evaluate_multi_write_receiver _1, scope, evaluated_receivers }
-      when Prism::CallNode
-        if node.receiver
-          receiver = evaluate(node.receiver, scope)
-          evaluated_receivers[node.receiver] = receiver if evaluated_receivers
-        end
+      when Prism::CallTargetNode, Prism::CallNode
+        receiver = evaluate(node.receiver, scope)
+        evaluated_receivers[node.receiver] = receiver if evaluated_receivers
+        receiver
+      when Prism::IndexTargetNode
+        receiver = evaluate(node.receiver, scope)
+        evaluated_receivers[node.receiver] = receiver if evaluated_receivers
         if node.arguments
           node.arguments.arguments&.each do |arg|
             if arg.is_a? Prism::SplatNode
-              evaluate arg.expression, scope
+              evaluate arg.expression, scope if arg.expression
             else
               evaluate arg, scope
             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
       end

data/lib/repl_type_completor/version.rb

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

data/lib/repl_type_completor.rb

@@ -68,19 +68,19 @@ module ReplTypeCompletor
       calculate_type_scope = ->(node) { TypeAnalyzer.calculate_target_type_scope binding, [*parents, target_node], node }
 
       case target_node
-      when Prism::StringNode, Prism::InterpolatedStringNode
+      when Prism::StringNode
+        return unless target_node.closing&.empty?
+
         call_node, args_node = parents.last(2)
         return unless call_node.is_a?(Prism::CallNode) && call_node.receiver.nil?
         return unless args_node.is_a?(Prism::ArgumentsNode) && args_node.arguments.size == 1
 
-        content = code.byteslice(target_node.opening_loc.end_offset..)
-        case call_node.name
-        when :require
-          [:require, content]
-        when :require_relative
-          [:require_relative, content]
+        if call_node.name == :require || call_node.name == :require_relative
+          [call_node.name, target_node.content]
         end
       when Prism::SymbolNode
+        return unless !target_node.closing || target_node.empty?
+
         name = target_node.value.to_s
         if parents.last.is_a? Prism::BlockArgumentNode # method(&:target)
           receiver_type, _scope = calculate_type_scope.call target_node
@@ -88,7 +88,9 @@ module ReplTypeCompletor
         else
           [:symbol, name] unless name.empty?
         end
-      when Prism::CallNode
+      when Prism::CallNode, Prism::CallTargetNode
+        return if target_node.is_a?(Prism::CallNode) && target_node.opening
+
         name = target_node.message.to_s
         return [:lvar_or_method, name, calculate_scope.call] if target_node.receiver.nil?
 
@@ -123,14 +125,8 @@ module ReplTypeCompletor
     end
 
     def find_target(node, position)
-      case node
-      when Prism::StringNode
-        # Unclosed quoted string has empty content and empty closing
-        return [node] if node.opening && node.closing&.empty?
-      when Prism::InterpolatedStringNode
-        # Unclosed double quoted string is InterpolatedStringNode with empty parts
-        return [node] if node.parts.empty? && node.opening && node.closing&.empty?
-      end
+      # Skip because NumberedParametersNode#location gives location of whole block
+      return if node.is_a? Prism::NumberedParametersNode
 
       node.compact_child_nodes.each do |n|
         match = find_target(n, position)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repl_type_completor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: Type based completion for REPL.
 email:
 - tomoyapenguin@gmail.com