Merge pull request #34 from ruby/require_prism_1_0_0

Use prism ~> 1.0

Author: tompng

.github/workflows/test.yml

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

lib/repl_type_completor/type_analyzer.rb

@@ -466,13 +466,19 @@ def evaluate_multi_write_node(node, scope)
       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
 
@@ -582,10 +588,10 @@ def evaluate_rescue_node(node, scope)
         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
@@ -700,8 +706,8 @@ def evaluate_case_node(node, scope)
       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
@@ -714,8 +720,8 @@ def evaluate_case_match_node(node, scope)
       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

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.29.0"
+  spec.add_dependency "prism", "~> 1.0"
   spec.add_dependency "rbs", ">= 2.7.0", "< 4.0.0"
 end