Merge pull request #896 from soutaro/begin-conditional

Fix type checking parenthesized conditional nodes
soutaro · Aug 10, 2023 · a5e5a5e · a5e5a5e
2 parents bbedb8d + 3033fe3
commit a5e5a5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,3 @@ group :stackprof, optional: true do
   gem "stackprof"
 end
 gem 'minitest-slow_test'
-
-group :development do
-  gem "ruby-lsp", require: false
-end
diff --git a/lib/steep/type_construction.rb b/lib/steep/type_construction.rb
@@ -710,7 +710,7 @@ def synthesize(node, hint: nil, condition: false)
                 end
               end
 
-              p = pair.constr.synthesize(last_node, hint: hint)
+              p = pair.constr.synthesize(last_node, hint: hint, condition: condition)
               last_pair = pair + p
               last_pair.constr.add_typing(node, type: last_pair.type, constr: last_pair.constr)
             else

diff --git a/test/type_check_test.rb b/test/type_check_test.rb
@@ -1601,4 +1601,25 @@ def test_untyped_nilp
       YAML
     )
   end
+
+  def test_paren_conditional
+    run_type_check_test(
+      signatures: {},
+      code: {
+        "a.rb" => <<~RUBY
+          a = [1].first
+          b = [2].first
+
+          if (a && b)
+            a + b
+          end
+        RUBY
+      },
+      expectations: <<~YAML
+        ---
+        - file: a.rb
+          diagnostics: []
+      YAML
+    )
+  end
 end