Skip to content

Commit 436504c

Browse files
committed
Do not discard amended format on warning in f
1 parent cc93000 commit 436504c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
116116
case Nil =>
117117

118118
loop(parts, n = 0)
119-
if reported then (Nil, Nil)
119+
if reported then (Nil, Nil) // on error, Transform.checked will revert to unamended inputs
120120
else
121121
assert(argc == actuals.size, s"Expected ${argc} args but got ${actuals.size} for [${parts.mkString(", ")}]")
122122
(amended.toList, actuals.toList)
@@ -320,5 +320,4 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List
320320
.tap(_ => reported = true)
321321
def partWarning(message: String, index: Int, offset: Int, end: Int): Unit =
322322
r.warning(BadFormatInterpolation(message), partPosAt(index, offset, end))
323-
.tap(_ => reported = true)
324323
end TypedFormatChecker

tests/run/i23693.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
k == K(42)
22
\k == \K(42)
3-
k ==
3+
k == K(42)
44
k == K(42)

0 commit comments

Comments
 (0)