Merge pull request #2231 from tk0miya/Union.to_s

Union#to_s should follow RBS/Lint/AmbiguousOperatorPrecedence
ruby · Jan 15, 2025 · 5c48490 · 5c48490
2 parents 17b74e8 + f5e8af0
commit 5c48490
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/rbs/types.rb b/lib/rbs/types.rb
@@ -751,10 +751,19 @@ def sub(s)
       end
 
       def to_s(level = 0)
+        strs = types.map do |ty|
+          case ty
+          when Intersection
+            ty.to_s([1, level].max)
+          else
+            ty.to_s
+          end
+        end
+
         if level > 0
-          "(#{types.join(" | ")})"
+          "(#{strs.join(" | ")})"
         else
-          types.join(" | ")
+          strs.join(" | ")
         end
       end
 

diff --git a/test/rbs/types_test.rb b/test/rbs/types_test.rb
@@ -23,9 +23,9 @@ def test_to_s
     assert_equal "(String | bool)?", parse_type("(String | bool)?").to_s
     assert_equal "String & bool?", parse_type("String & bool?").to_s
     assert_equal "(String & bool)?", parse_type("(String & bool)?").to_s
-    assert_equal "Integer | String & bool", parse_type("Integer | String & bool").to_s
+    assert_equal "Integer | (String & bool)", parse_type("Integer | String & bool").to_s
     assert_equal "(Integer | String) & bool", parse_type("(Integer | String) & bool").to_s
-    assert_equal "(Integer | String & bool)?", parse_type("(Integer | String & bool)?").to_s
+    assert_equal "(Integer | (String & bool))?", parse_type("(Integer | String & bool)?").to_s
     assert_equal "((Integer | String) & bool)?", parse_type("((Integer | String) & bool)?").to_s
     assert_equal "^() -> void", parse_type("^() -> void").to_s
     assert_equal "(^() -> void)?", parse_type("(^() -> void)?").to_s