repl_type_completor 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8060250e5e4f5251ad0e55bbe62123e7990c77b390f60b20b8ededd06baadeba
-  data.tar.gz: afb502380d8e26217a95e7a8e273bf3a93242ce8f2f88acadfffe4f462a10a3d
+  metadata.gz: 2e852d359a7203c7d7b6b001dc043cb749427339d7024bc13666baff16908076
+  data.tar.gz: c9f790626f9cf102b7571c7eb9612da3924b1e8f9d360bc9cd3881f48dc602a5
 SHA512:
-  metadata.gz: 99efc8d227d5a8a9003b79f3d397fb223a9c330484beee358b96d6963c03d07ac6b3d651fb0e2403d0b82dd1acaeb58834166e5a29350d0f400f3dd1071b53b7
-  data.tar.gz: 04a0c4d76215a73a41714f216a742c4dc620d042e5b34bcc6b8ccfabab006f9cf1417841be6d7a9afb0d7125388a27b9de06025ed1587193a2cf91d93a1c186c
+  metadata.gz: 6a60c14cde97df73039ea4be3572d7e53fbff6848229ec2f127ab1537d46ec2fecdcaf360bcb63460bb3e44237f08f4d962c0677b30f9aafdb575126b33efd84
+  data.tar.gz: 64a1113147f6d0a3a90958a2f9a106cd9d04a8678ee10103d54000b7c7b754584feb63382fbaf77534955ade2a8400ad19d76f696ad7d7faa9bb18cd0789e89c

data/lib/repl_type_completor/type_analyzer.rb

@@ -342,14 +342,14 @@ module ReplTypeCompletor
         Types::UnionType[left, right]
       else
         right = evaluate node.value, scope
-        method_call left, node.operator, [right], nil, nil, scope, name_match: false
+        method_call left, node.binary_operator, [right], nil, nil, scope, name_match: false
       end
     end
 
     def evaluate_variable_operator_write(node, scope)
       left = scope[node.name.to_s] || Types::OBJECT
       right = evaluate node.value, scope
-      scope[node.name.to_s] = method_call left, node.operator, [right], nil, nil, scope, name_match: false
+      scope[node.name.to_s] = method_call left, node.binary_operator, [right], nil, nil, scope, name_match: false
     end
     alias evaluate_global_variable_operator_write_node evaluate_variable_operator_write
     alias evaluate_local_variable_operator_write_node evaluate_variable_operator_write
@@ -378,7 +378,7 @@ module ReplTypeCompletor
     def evaluate_constant_operator_write_node(node, scope)
       left = scope[node.name.to_s] || Types::OBJECT
       right = evaluate node.value, scope
-      scope[node.name.to_s] = method_call left, node.operator, [right], nil, nil, scope, name_match: false
+      scope[node.name.to_s] = method_call left, node.binary_operator, [right], nil, nil, scope, name_match: false
     end
 
     def evaluate_constant_and_write_node(node, scope)
@@ -395,7 +395,7 @@ module ReplTypeCompletor
     def evaluate_constant_path_operator_write_node(node, scope)
       left, receiver, _parent_module, name = evaluate_constant_node_info node.target, scope
       right = evaluate node.value, scope
-      value = method_call left, node.operator, [right], nil, nil, scope, name_match: false
+      value = method_call left, node.binary_operator, [right], nil, nil, scope, name_match: false
       const_path_write receiver, name, value, scope
       value
     end
@@ -419,8 +419,7 @@ module ReplTypeCompletor
     def evaluate_constant_path_write_node(node, scope)
       receiver = evaluate node.target.parent, scope if node.target.parent
       value = evaluate node.value, scope
-      name = const_path_name(node.target)
-      const_path_write receiver, name, value, scope
+      const_path_write receiver, node.target.name.to_s, value, scope
       value
     end
 
@@ -467,13 +466,19 @@ module ReplTypeCompletor
       value.is_a?(Array) ? Types.array_of(*value) : value
     end
 
-    def evaluate_if_node(node, scope) = evaluate_if_unless(node, scope)
-    def evaluate_unless_node(node, scope) = evaluate_if_unless(node, scope)
-    def evaluate_if_unless(node, scope)
+    def evaluate_if_node(node, scope)
       evaluate node.predicate, scope
       Types::UnionType[*scope.run_branches(
         -> { node.statements ? evaluate(node.statements, _1) : Types::NIL },
-        -> { node.consequent ? evaluate(node.consequent, _1) : Types::NIL }
+        -> { node.subsequent ? evaluate(node.subsequent, _1) : Types::NIL }
+      )]
+    end
+
+    def evaluate_unless_node(node, scope)
+      evaluate node.predicate, scope
+      Types::UnionType[*scope.run_branches(
+        -> { node.statements ? evaluate(node.statements, _1) : Types::NIL },
+        -> { node.else_clause ? evaluate(node.else_clause, _1) : Types::NIL }
       )]
     end
 
@@ -583,10 +588,10 @@ module ReplTypeCompletor
         end
         node.statements ? evaluate(node.statements, s) : Types::NIL
       end
-      if node.consequent # begin; rescue A; rescue B; end
+      if node.subsequent # begin; rescue A; rescue B; end
         types = scope.run_branches(
           run_rescue,
-          -> { evaluate node.consequent, _1 }
+          -> { evaluate node.subsequent, _1 }
         )
         Types::UnionType[*types]
       else
@@ -701,8 +706,8 @@ module ReplTypeCompletor
       branches = node.conditions.map do |condition|
         ->(s) { evaluate_case_when_condition condition, s }
       end
-      if node.consequent
-        branches << ->(s) { evaluate node.consequent, s }
+      if node.else_clause
+        branches << ->(s) { evaluate node.else_clause, s }
       else
         branches << ->(_s) { Types::NIL }
       end
@@ -715,8 +720,8 @@ module ReplTypeCompletor
       branches = node.conditions.map do |condition|
         ->(s) { evaluate_case_in_condition target, condition, s }
       end
-      if node.consequent
-        branches << ->(s) { evaluate node.consequent, s }
+      if node.else_clause
+        branches << ->(s) { evaluate node.else_clause, s }
       end
       Types::UnionType[*scope.run_branches(*branches)]
     end
@@ -839,16 +844,6 @@ module ReplTypeCompletor
       [args_types, kwargs_types, block_sym_node, !!block_arg]
     end
 
-    def const_path_name(node)
-      if node.respond_to?(:name)
-        # ConstantPathNode#name ConstantPathTargetNode#name is added in Prism 0.28.0
-        node.name.to_s
-      else
-        # ConstantPathNode#child ConstantPathTargetNode#child is deprecated in Prism 0.28.0
-        node.child.name.to_s
-      end
-    end
-
     def const_path_write(receiver, name, value, scope)
       if receiver # receiver::A = value
         singleton_type = receiver.types.find { _1.is_a? Types::SingletonType }
@@ -875,9 +870,9 @@ module ReplTypeCompletor
     end
 
     def evaluate_constant_node_info(node, scope)
+      name = node.name.to_s
       case node
       when Prism::ConstantPathNode
-        name = const_path_name(node)
         if node.parent
           receiver = evaluate node.parent, scope
           if receiver.is_a? Types::SingletonType
@@ -893,7 +888,6 @@ module ReplTypeCompletor
           type = Types::NIL
         end
       when Prism::ConstantReadNode
-        name = node.name.to_s
         type = scope[name]
       end
       @dig_targets.resolve type, scope if @dig_targets.target? node
@@ -1048,8 +1042,7 @@ module ReplTypeCompletor
         scope[node.name.to_s] = value
       when Prism::ConstantPathTargetNode
         receiver = evaluated_receivers&.[](node.parent) || evaluate(node.parent, scope) if node.parent
-        name = const_path_name(node)
-        const_path_write receiver, name, value, scope
+        const_path_write receiver, node.name.to_s, value, scope
       end
     end
 

data/lib/repl_type_completor/types.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rbs'
+require 'rbs/cli'
 require_relative 'methods'
 
 module ReplTypeCompletor
@@ -22,8 +24,6 @@ module ReplTypeCompletor
 
     def self.load_rbs_builder
       @load_started = true
-      require 'rbs'
-      require 'rbs/cli'
       loader = RBS::CLI::LibraryOptions.new.loader
       loader.add path: Pathname('sig')
       @rbs_builder = RBS::DefinitionBuilder.new env: RBS::Environment.from_loader(loader).resolve_type_names

data/lib/repl_type_completor/version.rb

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

data/lib/repl_type_completor.rb

@@ -111,19 +111,7 @@ module ReplTypeCompletor
           [:const, name, Types::SingletonType.new(Object), scope]
         end
       when Prism::ConstantReadNode, Prism::ConstantTargetNode
-        name = target_node.name.to_s
-        if parents.last.is_a? Prism::ConstantPathNode
-          path_node = parents.last
-          if path_node.parent # A::B
-            receiver, scope = calculate_type_scope.call(path_node.parent)
-            [:const, name, receiver, scope]
-          else # ::A
-            scope = calculate_scope.call
-            [:const, name, Types::SingletonType.new(Object), scope]
-          end
-        else
-          [:const, name, nil, calculate_scope.call]
-        end
+        [:const, target_node.name.to_s, nil, calculate_scope.call]
       when Prism::GlobalVariableReadNode, Prism::GlobalVariableTargetNode
         [:gvar, target_node.name.to_s, calculate_scope.call]
       when Prism::InstanceVariableReadNode, Prism::InstanceVariableTargetNode

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: repl_type_completor
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-05 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement