Merge pull request #31 from ruby/operator_write_node_deprecation_fix

Update required prism to >= 0.29.0 and fix deprecation warning

Author: tompng

.github/workflows/test.yml

@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        prism: ['latest', '0.28.0', '0.27.0', '0.24.0', '0.21.0', '0.19.0']
+        prism: ['latest', '0.30.0', '0.29.0']
     env:
       GEMFILE_PRISM_VERSION: ${{ matrix.prism }}
     steps:

lib/repl_type_completor.rb

@@ -111,19 +111,7 @@ def analyze_code(code, binding = Object::TOPLEVEL_BINDING)
           [: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

lib/repl_type_completor/type_analyzer.rb

@@ -342,14 +342,14 @@ def evaluate_call_write(node, scope, operator, write_name)
         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 @@ def evaluate_variable_or_write(node, scope)
     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 @@ def evaluate_constant_or_write_node(node, scope)
     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 @@ def evaluate_constant_path_or_write_node(node, scope)
     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
 
@@ -839,16 +838,6 @@ def evaluate_call_node_arguments(call_node, scope)
       [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 +864,9 @@ def assign_required_parameter(node, value, scope)
     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 +882,6 @@ def evaluate_constant_node_info(node, scope)
           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 +1036,7 @@ def evaluate_write(node, value, scope, evaluated_receivers)
         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
 

repl_type_completor.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "prism", ">= 0.19.0"
+  spec.add_dependency "prism", ">= 0.29.0"
   spec.add_dependency "rbs", ">= 2.7.0", "< 4.0.0"
 end