Skip to content

Remove forced breaking of contextual function types #613

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

Open
kyay10 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove forced breaking of contextual function types #613

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
13 changes: 10 additions & 3 deletions core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1820,9 +1820,9 @@ class KotlinInputAstVisitor(
* Example `context(logger: Logger, raise: Raise<Error>)`
*
* Note this also supports the legacy receiver format of `context(Logger, Raise<Error>)` for
* backward compatibility.
* backward compatibility and for function types
*/
override fun visitContextReceiverList(contextReceiverList: KtContextReceiverList) {
private fun handleContextReceiverList(contextReceiverList: KtContextReceiverList) {
builder.sync(contextReceiverList)
builder.token("context")
visitEachCommaSeparated(
Expand All @@ -1832,6 +1832,10 @@ class KotlinInputAstVisitor(
breakAfterPrefix = false,
breakBeforePostfix = false,
)
}

override fun visitContextReceiverList(contextReceiverList: KtContextReceiverList) {
handleContextReceiverList(contextReceiverList)
builder.forcedBreak()
}

Expand Down Expand Up @@ -2465,7 +2469,10 @@ class KotlinInputAstVisitor(
override fun visitFunctionType(type: KtFunctionType) {
builder.sync(type)

type.contextReceiverList?.let { visitContextReceiverList(it) }
type.contextReceiverList?.let {
handleContextReceiverList(it)
builder.space()
}

val receiver = type.receiver
if (receiver != null) {
Expand Down
8 changes: 2 additions & 6 deletions core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8571,9 +8571,7 @@ class FormatterTest {
|
| fun <T> testSuspend(
| mock: T,
| block:
| suspend context(SomeContext)
| T.() -> Unit,
| block: suspend context(SomeContext) T.() -> Unit,
| ) = startCoroutine { T.block() }
|}
|"""
Expand Down Expand Up @@ -8629,9 +8627,7 @@ class FormatterTest {
|
| fun <T> testSuspend(
| mock: T,
| block:
| suspend context(someContext: SomeContext)
| T.() -> Unit,
| block: suspend context(someContext: SomeContext) T.() -> Unit,
| ) = startCoroutine { T.block() }
|}
|"""
Expand Down