Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Un'SKIP' tests which have been fixed previously #4224

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Un'SKIP' tests which have been fixed previously #4224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6608,7 +6608,7 @@ object a {
/** c1 */
def quux = ???
}
<<< SKIP #4133 try-catch with trailing comments 6, insert end markers
<<< #4133 try-catch with trailing comments 6, insert end markers
rewrite.scala3.insertEndMarkerMinLines = 2
===
object a:
Expand All @@ -6621,22 +6621,17 @@ object a:
quux
end foo
>>>
test does not parse: [dialect scala3] expected template body
object a:
^
def foo =
try bar
catch case baz => qux
====== full result: ======
object a:
def foo =
try bar
catch case baz => qux
end try
def foo =
try bar
catch
case baz =>
qux

// c1
quux
end foo
// c1
end try
quux
end foo
<<< #4133 enclosed new anonymous with comments and added end marker
rewrite.scala3 {
convertToNewSyntax = true
Expand Down
25 changes: 10 additions & 15 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6341,7 +6341,7 @@ object a {
/** c1 */
def quux = ???
}
<<< SKIP #4133 try-catch with trailing comments 6, insert end markers
<<< #4133 try-catch with trailing comments 6, insert end markers
rewrite.scala3.insertEndMarkerMinLines = 2
===
object a:
Expand All @@ -6354,22 +6354,17 @@ object a:
quux
end foo
>>>
test does not parse: [dialect scala3] expected template body
object a:
^
def foo =
try bar
catch case baz => qux
====== full result: ======
object a:
def foo =
try bar
catch case baz => qux
end try
def foo =
try bar
catch
case baz =>
qux

// c1
quux
end foo
// c1
end try
quux
end foo
<<< #4133 enclosed new anonymous with comments and added end marker
rewrite.scala3 {
convertToNewSyntax = true
Expand Down
27 changes: 11 additions & 16 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6632,7 +6632,7 @@ object a {
/** c1 */
def quux = ???
}
<<< SKIP #4133 try-catch with trailing comments 6, insert end markers
<<< #4133 try-catch with trailing comments 6, insert end markers
rewrite.scala3.insertEndMarkerMinLines = 2
===
object a:
Expand All @@ -6645,23 +6645,18 @@ object a:
quux
end foo
>>>
test does not parse: [dialect scala3] expected template body
object a:
^
def foo =
try
bar
====== full result: ======
object a:
def foo =
try
bar
catch case baz => qux
end try
def foo =
try
bar
catch
case baz =>
qux

// c1
quux
end foo
// c1
end try
quux
end foo
<<< #4133 enclosed new anonymous with comments and added end marker
rewrite.scala3 {
convertToNewSyntax = true
Expand Down
29 changes: 11 additions & 18 deletions scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6808,7 +6808,7 @@ object a {
/** c1 */
def quux = ???
}
<<< SKIP #4133 try-catch with trailing comments 6, insert end markers
<<< #4133 try-catch with trailing comments 6, insert end markers
rewrite.scala3.insertEndMarkerMinLines = 2
===
object a:
Expand All @@ -6821,25 +6821,18 @@ object a:
quux
end foo
>>>
test does not parse: [dialect scala3] expected template body
object a:
^
def foo =
try
bar
====== full result: ======
object a:
def foo =
try
bar
catch
case baz =>
qux
end try
def foo =
try
bar
catch
case baz =>
qux

// c1
quux
end foo
// c1
end try
quux
end foo
<<< #4133 enclosed new anonymous with comments and added end marker
rewrite.scala3 {
convertToNewSyntax = true
Expand Down
Loading