Merge pull request #469 from scala/backport-lts-3.3-22828

Backport "standardize on `-Vprint:...` (still support `-Xprint:...` as alias)" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/Run.scala

@@ -338,7 +338,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
             profiler.onPhase(phase):
               try units = phase.runOn(units)
               catch case _: InterruptedException => cancelInterrupted()
-            if (ctx.settings.Xprint.value.containsPhase(phase))
+            if (ctx.settings.Vprint.value.containsPhase(phase))
               for (unit <- units)
                 lastPrintedTree =
                   printTree(lastPrintedTree)(using ctx.fresh.setPhase(phase.next).setCompilationUnit(unit))

compiler/src/dotty/tools/dotc/config/CliCommand.scala

@@ -33,8 +33,8 @@ trait CliCommand:
     |<phases> means one or a comma-separated list of:
     |  - (partial) phase names with an optional "+" suffix to include the next phase
     |  - the string "all"
-    |  example: -Xprint:all prints all phases.
-    |  example: -Xprint:typer,mixin prints the typer and mixin phases.
+    |  example: -Vprint:all prints all phases.
+    |  example: -Vprint:typer,mixin prints the typer and mixin phases.
     |  example: -Ylog:erasure+ logs the erasure phase and the phase after the erasure phase.
     |           This is useful because during the tree transform of phase X, we often
     |           already are in phase X + 1.

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -154,7 +154,7 @@ private sealed trait PluginSettings:
 private sealed trait VerboseSettings:
   self: SettingGroup =>
   val Vhelp: Setting[Boolean] = BooleanSetting("-V", "Print a synopsis of verbose options.")
-  val Xprint: Setting[List[String]] = PhasesSetting("-Vprint", "Print out program after", aliases = List("-Xprint"))
+  val Vprint: Setting[List[String]] = PhasesSetting("-Vprint", "Print out program after", aliases = List("-Xprint"))
   val XshowPhases: Setting[Boolean] = BooleanSetting("-Vphases", "List compiler phases.", aliases = List("-Xshow-phases"))
 
   val Vprofile: Setting[Boolean] = BooleanSetting("-Vprofile", "Show metrics about sources and internal representations to estimate compile-time complexity.")

compiler/src/dotty/tools/dotc/core/Phases.scala

@@ -300,7 +300,7 @@ object Phases {
      *  instance, it is possible to print trees after a given phase using:
      *
      *  ```bash
-     *  $ ./bin/scalac -Xprint:<phaseNameHere> sourceFile.scala
+     *  $ ./bin/scalac -Vprint:<phaseNameHere> sourceFile.scala
      *  ```
      */
     def phaseName: String

compiler/src/dotty/tools/dotc/transform/Recheck.scala

@@ -149,7 +149,7 @@ abstract class Recheck extends Phase, SymTransformer:
      *  can be retrieved with `knownType`
      */
     private val keepAllTypes = inContext(ictx) {
-      ictx.settings.Xprint.value.containsPhase(thisPhase)
+      ictx.settings.Vprint.value.containsPhase(thisPhase)
     }
 
     /** Should type of `tree` be kept in an attachment so that it can be retrieved with

compiler/test/dotty/tools/dotc/printing/PrintingTest.scala

@@ -27,7 +27,7 @@ class PrintingTest {
   def options(phase: String, flags: List[String]) =
     val outDir = ParallelTesting.defaultOutputDir + "printing" + File.pathSeparator
     File(outDir).mkdirs()
-    List(s"-Xprint:$phase", "-color:never", "-nowarn", "-d", outDir, "-classpath", TestConfiguration.basicClasspath) ::: flags
+    List(s"-Vprint:$phase", "-color:never", "-nowarn", "-d", outDir, "-classpath", TestConfiguration.basicClasspath) ::: flags
 
   private def compileFile(path: JPath, phase: String): Boolean = {
     val baseFilePath  = path.toString.stripSuffix(".scala")

compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala

@@ -138,7 +138,7 @@ class SemanticdbTests:
       "-feature",
       "-deprecation",
       // "-Ydebug-flags",
-      // "-Xprint:extractSemanticDB",
+      // "-Vprint:extractSemanticDB",
       "-sourceroot", expectSrc.toString,
       "-classpath", target.toString,
       "-Xignore-scala2-macros",

compiler/test/dotty/tools/repl/ReplCompilerTests.scala

@@ -422,7 +422,7 @@ object ReplCompilerTests:
 
 end ReplCompilerTests
 
-class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer"):
+class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Vprint:typer"):
   @Test def i9111 = initially {
     run("""|enum E {
            |  case A

docs/_docs/contributing/debugging/ide-debugging.md

@@ -140,7 +140,7 @@ And concatenate the output into the classpath argument, which should already con
 
 In the `args` you can add any additional compiler option you want.
 
-For instance you can add `-Xprint:all` to print all the generated trees after each mega phase.
+For instance you can add `-Vprint:all` to print all the generated trees after each mega phase.
 
 Run `scalac -help` to get an overview of the available compiler options.
 

docs/_docs/contributing/debugging/inspection.md

@@ -61,9 +61,9 @@ Sometimes you may want to stop the compiler after a certain phase, for example t
 knock-on errors from occurring from a bug in an earlier phase. Use the flag
 `-Ystop-after:<phase-name>` to prevent any phases executing afterwards.
 
-> e.g. `-Xprint:<phase>` where `phase` is a miniphase, will print after
+> e.g. `-Vprint:<phase>` where `phase` is a miniphase, will print after
 > the whole phase group is complete, which may be several miniphases after `phase`.
-> Instead you can use `-Ystop-after:<phase> -Xprint:<phase>` to stop
+> Instead you can use `-Ystop-after:<phase> -Vprint:<phase>` to stop
 > immediately after the miniphase and see the trees that you intended.
 
 ## Printing TASTy of a Class

docs/_docs/contributing/debugging/other-debugging.md

@@ -137,19 +137,19 @@ assertPositioned(tree.reporting(s"Tree is: $result"))
 To print out the trees you are compiling after the FrontEnd (scanner, parser, namer, typer) phases:
 
 ```shell
-scalac -Xprint:typer ../issues/Playground.scala
+scalac -Vprint:typer ../issues/Playground.scala
 ```
 
 To print out the trees after Frontend and CollectSuperCalls phases:
 
 ```shell
-scalac -Xprint:typer,collectSuperCalls ../issues/Playground.scala
+scalac -Vprint:typer,collectSuperCalls ../issues/Playground.scala
 ```
 
 To print out the trees after all phases:
 
 ```shell
-scalac -Xprint:all ../issues/Playground.scala
+scalac -Vprint:all ../issues/Playground.scala
 ```
 
 To find out the list of all the phases and their names, check out [this](https://github.com/lampepfl/dotty/blob/10526a7d0aa8910729b6036ee51942e05b71abf6/compiler/src/dotty/tools/dotc/Compiler.scala#L34) line in `Compiler.scala`. Each `Phase` object has `phaseName` defined on it, this is the phase name.
@@ -219,7 +219,7 @@ And is to be used as:
 scalac -Yprint-pos  ../issues/Playground.scala
 ```
 
-If used, all the trees output with `show` or via `-Xprint:typer` will also have positions attached to them, e.g.:
+If used, all the trees output with `show` or via `-Vprint:typer` will also have positions attached to them, e.g.:
 
 ```scala
 package <empty>@<Playground.scala:1> {
@@ -247,7 +247,7 @@ package <empty>@<Playground.scala:1> {
 Every [Positioned](https://github.com/lampepfl/dotty/blob/10526a7d0aa8910729b6036ee51942e05b71abf6/compiler/src/dotty/tools/dotc/ast/Positioned.scala) (a parent class of `Tree`) object has a `uniqueId` field. It is an integer that is unique for that tree and doesn't change from compile run to compile run. You can output these IDs from any printer (such as the ones used by `.show` and `-Xprint`) via `-Yshow-tree-ids` flag, e.g.:
 
 ```shell
-scalac -Xprint:typer -Yshow-tree-ids  ../issues/Playground.scala
+scalac -Vprint:typer -Yshow-tree-ids  ../issues/Playground.scala
 ```
 
 Gives:

docs/_docs/contributing/issues/cause.md

@@ -18,10 +18,10 @@ As described in the [compiler lifecycle](../architecture/lifecycle.md#phases-2),
 each phase transforms the trees and types that represent your code in a certain
 way.
 
-To print the code as it is transformed through the compiler, use the compiler flag `-Xprint:all`.
+To print the code as it is transformed through the compiler, use the compiler flag `-Vprint:all`.
 After each phase group is completed, you will see the resulting trees representing the code.
 
-> It is recommended to test `-Xprint:all` on a single, small file, otherwise a lot of unnecessary
+> It is recommended to test `-Vprint:all` on a single, small file, otherwise a lot of unnecessary
 > output will be generated.
 
 ### Trace a Tree Creation Site
@@ -31,7 +31,7 @@ your search to the code of that phase. For example if you found a problematic tr
 `posttyper`, the problem most likely appears in the code of [PostTyper]. We can trace the exact point
 the tree was generated by looking for its unique ID, and then generating a stack trace at its creation:
 
-1. Run the compiler with `-Xprint:posttyper` and `-Yshow-tree-ids` flags.
+1. Run the compiler with `-Vprint:posttyper` and `-Yshow-tree-ids` flags.
    This will only print the trees of the `posttyper` phase. This time you should see the tree
    in question be printed alongside its ID. You'll see something like `println#223("Hello World"#37)`.
 2. Copy the ID of the desired tree.
@@ -43,7 +43,7 @@ Do not use a conditional breakpoint, the time overhead is very significant for a
 
 ### Enhanced Tree Printing
 
-As seen above `-Xprint:<phase>` can be enhanced with further configuration flags, found in
+As seen above `-Vprint:<phase>` can be enhanced with further configuration flags, found in
 [ScalaSettings]. For example, you can additionally print the type of a tree with `-Xprint-types`.
 
 ## Increasing Logging Output

docs/_docs/contributing/issues/reproduce.md

@@ -39,9 +39,9 @@ $ scalac <OPTIONS> <FILE>
 
 Here are some useful debugging `<OPTIONS>`:
 
-* `-Xprint:PHASE1,PHASE2,...` or `-Xprint:all`: prints the `AST` after each
+* `-Vprint:PHASE1,PHASE2,...` or `-Vprint:all`: prints the `AST` after each
   specified phase. Phase names can be found by examining the
-  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Xprint:erasure`.
+  `dotty.tools.dotc.transform.*` classes for their `phaseName` field e.g., `-Vprint:erasure`.
   You can discover all phases in the `dotty.tools.dotc.Compiler` class
 * `-Ylog:PHASE1,PHASE2,...` or `-Ylog:all`: enables `ctx.log("")` logging for
   the specified phase.
@@ -142,7 +142,7 @@ $ (rm -rv out || true) && mkdir out # clean up compiler output, create `out` dir
 
 scalac  # Invoke the compiler task defined by the Dotty sbt project
   -d $here/out  # All the artefacts go to the `out` folder created earlier
-  # -Xprint:typer  # Useful debug flags, commented out and ready for quick usage. Should you need one, you can quickly access it by uncommenting it.
+  # -Vprint:typer  # Useful debug flags, commented out and ready for quick usage. Should you need one, you can quickly access it by uncommenting it.
   # -Ydebug-error
   # -Yprint-debug
   # -Yprint-debug-owners

docs/_docs/reference/experimental/cc.md

@@ -656,7 +656,7 @@ TBD
 
 The following options are relevant for capture checking.
 
- - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking.
+ - **-Vprint:cc** Prints the program with capturing types as inferred by capture checking.
  - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section.
 
  The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch.

docs/_spec/TODOreference/experimental/cc.md

@@ -655,7 +655,7 @@ TBD
 The following options are relevant for capture checking.
 
  - **-Ycc** Enables capture checking.
- - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking.
+ - **-Vprint:cc** Prints the program with capturing types as inferred by capture checking.
  - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section.
 
  The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch.

project/scripts/options

@@ -1,2 +1,2 @@
--Xprint:frontend -Ylog:frontend
+-Vprint:frontend -Ylog:frontend
 -Ycheck:all

sbt-test/scala2-compat/i13332/build.sbt

@@ -10,5 +10,5 @@ lazy val app = project.in(file("app"))
   .dependsOn(lib)
   .settings(
     scalaVersion := scala3Version,
-    scalacOptions += "-Xprint:inlining"
-  )
+    scalacOptions += "-Vprint:inlining"
+  )

tests/disabled/partest/run/delambdafy_t6028.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Ydelambdafy:method -Xprint:lambdalift -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Ydelambdafy:method -Vprint:lambdalift -d " + testOutput.path
 
   override def code = """class T(classParam: Int) {
                         |  val field: Int = 0

tests/disabled/partest/run/delambdafy_t6555.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:specialize -Ydelambdafy:method -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:specialize -Ydelambdafy:method -d " + testOutput.path
 
   override def code = "class Foo { val f = (param: Int) => param } "
 

tests/disabled/partest/run/delambdafy_uncurry_byname_inline.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar(x: => Int) = x

tests/disabled/partest/run/delambdafy_uncurry_byname_method.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar(x: => Int) = x

tests/disabled/partest/run/delambdafy_uncurry_inline.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar = {

tests/disabled/partest/run/delambdafy_uncurry_method.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:uncurry -Ydelambdafy:method -Ystop-after:uncurry -d " + testOutput.path
 
   override def code = """class Foo {
                         |  def bar = {

tests/disabled/partest/run/dynamic-applyDynamic.scala

@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {
@@ -23,4 +23,4 @@ object Test extends DirectTest {
 import language.dynamics
 class D extends Dynamic {
   def applyDynamic(name: String)(value: Any) = ???
-}
+}

tests/disabled/partest/run/dynamic-applyDynamicNamed.scala

@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {

tests/disabled/partest/run/dynamic-selectDynamic.scala

@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {

tests/disabled/partest/run/dynamic-updateDynamic.scala

@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
     object X {

tests/disabled/partest/run/existential-rangepos.scala

@@ -1,7 +1,7 @@
 import scala.tools.partest._
 
 object Test extends DirectTest {
-  override def extraSettings: String = "-usejavacp -Yrangepos -Xprint:patmat -Xprint-pos -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Yrangepos -Vprint:patmat -Xprint-pos -d " + testOutput.path
 
   override def code = """
 abstract class A[T] {

tests/disabled/partest/run/t4287inferredMethodTypes.scala

@@ -3,7 +3,7 @@ import scala.tools.partest.DirectTest
 object Test extends DirectTest {
 
   override def extraSettings: String =
-    s"-usejavacp -Yinfer-argument-types -Xprint-pos -Xprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
+    s"-usejavacp -Yinfer-argument-types -Xprint-pos -Vprint:typer -Yrangepos -Ystop-after:typer -d ${testOutput.path}"
 
   override def code = """
 class A(a: Int = A.a)
@@ -22,4 +22,4 @@ class B extends A {
       compile()
     }
   }
-}
+}

tests/disabled/partest/run/t5603.scala

@@ -7,7 +7,7 @@ import scala.tools.nsc.reporters.ConsoleReporter
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:parser -Ystop-after:parser -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:parser -Ystop-after:parser -d " + testOutput.path
 
   override def code = """
     trait Greeting {

tests/disabled/partest/run/t5699.scala

@@ -7,7 +7,7 @@ object Test extends DirectTest {
     |public @interface MyAnnotation { String value(); }
   """.stripMargin
 
-  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Xprint:parser"
+  override def extraSettings: String = "-usejavacp -Ystop-after:typer -Vprint:parser"
 
   override def show(): Unit = {
     // redirect err to out, for logging

tests/disabled/partest/run/t6028.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Ydelambdafy:inline -Xprint:lambdalift -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Ydelambdafy:inline -Vprint:lambdalift -d " + testOutput.path
 
   override def code = """class T(classParam: Int) {
                         |  val field: Int = 0

tests/disabled/partest/run/t6288.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:patmat -Xprint-pos -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:patmat -Xprint-pos -d " + testOutput.path
 
   override def code =
     """

tests/disabled/partest/run/t6555.scala

@@ -3,7 +3,7 @@ import java.io.{Console => _, _}
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:specialize -Ydelambdafy:inline -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:specialize -Ydelambdafy:inline -d " + testOutput.path
 
   override def code = "class Foo { val f = (param: Int) => param } "
 

tests/disabled/partest/run/t7271.scala

@@ -7,7 +7,7 @@ import scala.reflect.internal.Positions
 
 object Test extends DirectTest {
 
-  override def extraSettings: String = "-usejavacp -Xprint:parser -Ystop-after:parser -d " + testOutput.path
+  override def extraSettings: String = "-usejavacp -Vprint:parser -Ystop-after:parser -d " + testOutput.path
 
   override def code = """
     class C {