Improve with in type migration warning (#18852)

nicolasstucki · web-flow · commit 6a5c037974b0 · 2023-11-06T13:20:20.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1756,12 +1756,13 @@ object Parsers {
         if in.token == LBRACE || in.token == INDENT then
           t
         else
+          val withSpan = Span(withOffset, withOffset + 4)
           report.errorOrMigrationWarning(
             DeprecatedWithOperator(rewriteNotice(`future-migration`)),
-            in.sourcePos(withOffset),
+            source.atSpan(withSpan),
             from = future)
           if sourceVersion == `future-migration` then
-            patch(source, Span(withOffset, withOffset + 4), "&")
+            patch(source, withSpan, "&")
           atSpan(startOffset(t)) { makeAndType(t, withType()) }
       else t
 
diff --git a/tests/neg/with-type-operator-future-migration.check b/tests/neg/with-type-operator-future-migration.check
@@ -1,6 +1,6 @@
 -- [E003] Syntax Error: tests/neg/with-type-operator-future-migration.scala:5:13 ---------------------------------------
 5 |def foo: Int with String = ??? // error
-  |             ^
+  |             ^^^^
   |             with as a type operator has been deprecated; use & instead
   |             This construct can be rewritten automatically under -rewrite -source future-migration.
   |

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`-- [E003] Syntax Error: tests/neg/with-type-operator-future-migration.scala:5:13 ---------------------------------------`
`2`	`2`	`5 \|def foo: Int with String = ??? // error`
`3`		`- \| ^`
	`3`	`+ \| ^^^^`
`4`	`4`	`\| with as a type operator has been deprecated; use & instead`
`5`	`5`	`\| This construct can be rewritten automatically under -rewrite -source future-migration.`
`6`	`6`	`\|`