Require prism >= 0.18.0 (MatchWriteNode#targets and CaseMatchNode)

Author: tompng

.github/workflows/test.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        prism: ['0.17.1']
+        prism: ['0.18.0']
     env:
       GEMFILE_PRISM_VERSION: ${{matrix.prism}}
     steps:

lib/repl_completion/type_analyzer.rb

@@ -702,19 +702,31 @@ def evaluate_for_node(node, scope)
     end
 
     def evaluate_case_node(node, scope)
-      target = evaluate(node.predicate, scope) if node.predicate
+      evaluate(node.predicate, scope) if node.predicate
       # TODO
       branches = node.conditions.map do |condition|
-        ->(s) { evaluate_case_match target, condition, s }
+        ->(s) { evaluate_case_when_condition condition, s }
       end
       if node.consequent
         branches << ->(s) { evaluate node.consequent, s }
-      elsif node.conditions.any? { _1.is_a? Prism::WhenNode }
+      else
         branches << ->(_s) { Types::NIL }
       end
       Types::UnionType[*scope.run_branches(*branches)]
     end
 
+    def evaluate_case_match_node(node, scope)
+      target = evaluate(node.predicate, scope)
+      # TODO
+      branches = node.conditions.map do |condition|
+        ->(s) { evaluate_case_in_condition target, condition, s }
+      end
+      if node.consequent
+        branches << ->(s) { evaluate node.consequent, s }
+      end
+      Types::UnionType[*scope.run_branches(*branches)]
+    end
+
     def evaluate_match_required_node(node, scope)
       value_type = evaluate node.value, scope
       evaluate_match_pattern value_type, node.pattern, scope
@@ -764,7 +776,8 @@ def evaluate_implicit_node(node, scope)
     def evaluate_match_write_node(node, scope)
       # /(?<a>)(?<b>)/ =~ string
       evaluate node.call, scope
-      node.locals.each { scope[_1.to_s] = Types::UnionType[Types::STRING, Types::NIL] }
+      locals = node.targets.map(&:name)
+      locals.each { scope[_1.to_s] = Types::UnionType[Types::STRING, Types::NIL] }
       Types::BOOLEAN
     end
 
@@ -947,21 +960,20 @@ def assign_numbered_parameters(numbered_parameters, scope, args, _kwargs)
       end
     end
 
-    def evaluate_case_match(target, node, scope)
-      case node
-      when Prism::WhenNode
-        node.conditions.each { evaluate _1, scope }
-        node.statements ? evaluate(node.statements, scope) : Types::NIL
-      when Prism::InNode
-        pattern = node.pattern
-        if pattern.is_a?(Prism::IfNode) || pattern.is_a?(Prism::UnlessNode)
-          cond_node = pattern.predicate
-          pattern = pattern.statements.body.first
-        end
-        evaluate_match_pattern(target, pattern, scope)
-        evaluate cond_node, scope if cond_node # TODO: conditional branch
-        node.statements ? evaluate(node.statements, scope) : Types::NIL
+    def evaluate_case_when_condition(node, scope)
+      node.conditions.each { evaluate _1, scope }
+      node.statements ? evaluate(node.statements, scope) : Types::NIL
+    end
+
+    def evaluate_case_in_condition(target, node, scope)
+      pattern = node.pattern
+      if pattern.is_a?(Prism::IfNode) || pattern.is_a?(Prism::UnlessNode)
+        cond_node = pattern.predicate
+        pattern = pattern.statements.body.first
       end
+      evaluate_match_pattern(target, pattern, scope)
+      evaluate cond_node, scope if cond_node # TODO: conditional branch
+      node.statements ? evaluate(node.statements, scope) : Types::NIL
     end
 
     def evaluate_match_pattern(value, pattern, scope)

repl_completion.gemspec

@@ -31,6 +31,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.17.1"
+  spec.add_dependency "prism", ">= 0.18.0"
   spec.add_dependency "rbs", ">= 2.7.0"
 end