Improve this qualifier warning

Author: som-snytt

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -3426,9 +3426,10 @@ object Parsers {
         }
         if mods1.is(Local) then
           val span = Span(startOffset, in.lastOffset)
+          val p = if mods1.is(Private) then "private" else "protected"
           report.errorOrMigrationWarning(
               em"""Ignoring [this] qualifier.
-                  |This syntax will be deprecated in the future; it should be dropped.
+                  |The syntax `$p[this]` will be deprecated in the future; just write `$p` instead.
                   |See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html${rewriteNotice(`3.4-migration`)}""",
               in.sourcePos().withSpan(span),
               MigrationVersion.RemoveThisQualifier)

tests/semanticdb/metac.expect

@@ -43,12 +43,12 @@ Occurrences:
 [9:11..9:14): ??? -> scala/Predef.`???`().
 
 Diagnostics:
-[4:16..4:16): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[4:9..4:15): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
-[7:18..7:18): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[7:11..7:17): [warning] Ignoring [this] qualifier.
+The syntax `protected[this]` will be deprecated in the future; just write `protected` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
 
@@ -823,13 +823,13 @@ Occurrences:
 Diagnostics:
 [13:20..13:21): [warning] unused explicit parameter
 [18:9..18:10): [warning] unused explicit parameter
-[20:23..20:23): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[20:16..20:22): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
 [20:27..20:28): [warning] unused explicit parameter
-[22:23..22:23): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[22:16..22:22): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
 [22:27..22:28): [warning] unused explicit parameter
@@ -4553,20 +4553,20 @@ Occurrences:
 
 Diagnostics:
 [2:20..2:21): [warning] unused explicit parameter
-[5:16..5:16): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[5:9..5:15): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
-[7:16..7:16): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[7:9..7:15): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
-[12:16..12:16): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[12:9..12:15): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
-[13:16..13:16): [warning] Ignoring [this] qualifier.
-This syntax will be deprecated in the future; it should be dropped.
+[13:9..13:15): [warning] Ignoring [this] qualifier.
+The syntax `private[this]` will be deprecated in the future; just write `private` instead.
 See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
 This construct can be rewritten automatically under -rewrite -source 3.4-migration.
 

tests/warn/private-this-3.4.check

@@ -2,13 +2,13 @@
 4 |  private[this] def foo: Int = ??? // warn: migration warning
   |         ^^^^^^
   |         Ignoring [this] qualifier.
-  |         This syntax will be deprecated in the future; it should be dropped.
+  |         The syntax `private[this]` will be deprecated in the future; just write `private` instead.
   |         See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
   |         This construct can be rewritten automatically under -rewrite -source 3.4-migration.
 -- Warning: tests/warn/private-this-3.4.scala:5:11 ---------------------------------------------------------------------
 5 |  protected[this] def bar: Int = ??? // warn: migration warning
   |           ^^^^^^
   |           Ignoring [this] qualifier.
-  |           This syntax will be deprecated in the future; it should be dropped.
+  |           The syntax `protected[this]` will be deprecated in the future; just write `protected` instead.
   |           See: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html
   |           This construct can be rewritten automatically under -rewrite -source 3.4-migration.