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

FormatWriter: move logic to getAlignNonSlcOwner #3919

Merged
merged 1 commit into from
Apr 9, 2024
Merged

FormatWriter: move logic to getAlignNonSlcOwner #3919

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
44 changes: 24 additions & 20 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,16 +1149,7 @@ class FormatWriter(formatOps: FormatOps) {
columnShift += floc.shift
if (floc.hasBreakAfter || ft.leftHasNewline) floc
else {
val slc = tokens.isRightLikeSingleLineComment(ft)
val code = if (slc) "//" else ft.meta.right.text
floc.style.alignMap.get(code).flatMap { matchers =>
// Corner case when line ends with comment
val nonSlcOwner =
if (slc) None else Some(getAlignOwnerNonComment(ft))
val owner = nonSlcOwner.getOrElse(ft.meta.leftOwner)
val ok = matchers.isEmpty || matchers.exists(_.matches(owner))
if (ok) Some(nonSlcOwner) else None
}.foreach { nonSlcOwner =>
getAlignNonSlcOwner(ft).foreach { nonSlcOwner =>
val container =
getAlignContainer(nonSlcOwner.getOrElse(ft.meta.rightOwner))
def appendCandidate() = columnCandidates += new AlignStop(
Expand All @@ -1170,7 +1161,7 @@ class FormatWriter(formatOps: FormatOps) {
if (alignContainer eq null) alignContainer = container
else if (alignContainer ne container) {
val pos1 = alignContainer.pos
if (slc) {
if (nonSlcOwner.isEmpty) {
val prevFt = tokens.prevNonCommentSameLine(ft)
if (pos1.end >= prevFt.left.end) appendCandidate()
} else {
Expand Down Expand Up @@ -1591,15 +1582,6 @@ class FormatWriter(formatOps: FormatOps) {
(tokenKey, ownerKey).hashCode()
}

private def getAlignOwnerNonComment(ft: FormatToken): Tree =
ft.meta.rightOwner match {
case name: Term.Name => name.parent match {
case Some(p: Term.ApplyInfix) => p
case _ => name
}
case x => x
}

private def columnMatches(
block: AlignBlock,
line: AlignLine,
Expand Down Expand Up @@ -1788,6 +1770,28 @@ object FormatWriter {
if (useLeft) floc.state.prev.column else floc.state.column
}

private def getAlignNonSlcOwner(
ft: FormatToken,
)(implicit floc: FormatLocation, tokens: FormatTokens): Option[Option[Tree]] = {
def getNonSlcOwner = ft.meta.rightOwner match {
case name: Term.Name => name.parent match {
case Some(p: Term.ApplyInfix) => p
case _ => name
}
case x => x
}

val slc = tokens.isRightLikeSingleLineComment(ft)
val code = if (slc) "//" else ft.meta.right.text
floc.style.alignMap.get(code).flatMap { matchers =>
// Corner case when line ends with comment
val nonSlcOwner = if (slc) None else Some(getNonSlcOwner)
val owner = nonSlcOwner.getOrElse(ft.meta.leftOwner)
val ok = matchers.isEmpty || matchers.exists(_.matches(owner))
if (ok) Some(nonSlcOwner) else None
}
}

// cache indentations to some level
private val indentations: IndexedSeq[String] = {
val size = 64
Expand Down
Loading