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

FormatOps: look for keyword past enclosing parens #3984

Merged
merged 1 commit into from
May 13, 2024
Merged

FormatOps: look for keyword past enclosing parens #3984

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
38 changes: 20 additions & 18 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2391,24 +2391,26 @@ class FormatOps(
def indentAndBreakBeforeCtrl[A](tree: Tree, split: Split)(implicit
style: ScalafmtConfig,
classifier: Classifier[T, A],
): Option[Split] =
if (
!style.dialect.allowSignificantIndentation ||
tree.is[Term.Block] && !split.isNL && isEnclosedInMatching(tree)
) None
else {
val kw = tokenAfter(tree).right
if (kw.is[A]) Some {
val indent = style.indent.ctrlSite
.getOrElse(style.indent.getSignificant)
def policy =
if (split.isNL) decideNewlinesOnlyBeforeClose(kw)
else decideNewlinesOnlyBeforeCloseOnBreak(kw)
split.withIndent(Num(indent), kw, ExpiresOn.Before)
.andPolicy(policy, !style.danglingParentheses.ctrlSite)
}
else None
}
): Option[Split] = Some {
if (!style.dialect.allowSignificantIndentation) return None

val treeTokens = tree.tokens
val head = treeTokens.head
val hft = tokens.after(head)
if (hft.left.eq(head) && tree.is[Term.Block] && !split.isNL) return None

val beg = tokens.getOnOrBeforeOwned(hft, tree)
val end = tokens.getLastNonTrivial(treeTokens, tree)
val kw = tokens.getClosingIfInParens(end)(beg).fold(end)(next).right
if (!kw.is[A]) return None

val indent = style.indent.ctrlSite.getOrElse(style.indent.getSignificant)
def policy =
if (split.isNL) decideNewlinesOnlyBeforeClose(kw)
else decideNewlinesOnlyBeforeCloseOnBreak(kw)
split.withIndent(Num(indent), kw, ExpiresOn.Before)
.andPolicy(policy, !style.danglingParentheses.ctrlSite)
}

}

Expand Down
Loading