Merge branch 'main' into i24120-move-MatchReducer

Author: Lluc24

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

@@ -290,12 +290,16 @@ private sealed trait WarningSettings:
   )
 
   object WshadowHas:
-    def allOr(s: String)(using Context) =
-      Wshadow.value.pipe(us => us.contains("all") || us.contains(s))
+    // Is any choice set for -Wshadow?
+    def any(using Context): Boolean = Wall.value || Wshadow.value.nonEmpty
+
+    def allOr(s: String)(using Context): Boolean =
+      Wall.value || Wshadow.value.pipe(us => us.contains("all") || us.contains(s))
     def privateShadow(using Context) =
       allOr("private-shadow")
     def typeParameterShadow(using Context) =
       allOr("type-parameter-shadow")
+  end WshadowHas
 
   val WsafeInit: Setting[Boolean] = BooleanSetting(WarningSetting, "Wsafe-init", "Ensure safe initialization of objects.")
 

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -705,7 +705,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
   def toText(denot: Denotation): Text = toText(denot.symbol) ~ "/D"
 
   def toText(const: Constant): Text = const.tag match {
-    case StringTag => stringText(Chars.escapedString(const.value.toString, quoted = true))
+    case StringTag => literalText(Chars.escapedString(const.value.toString, quoted = true))
     case ClazzTag => "classOf[" ~ toText(const.typeValue) ~ "]"
     case CharTag => literalText(Chars.escapedChar(const.charValue))
     case LongTag => literalText(const.longValue.toString + "L")
@@ -841,10 +841,9 @@ class PlainPrinter(_ctx: Context) extends Printer {
 
   protected def keywordStr(text: String): String = coloredStr(text, SyntaxHighlighting.KeywordColor)
   protected def keywordText(text: String): Text = coloredStr(text, SyntaxHighlighting.KeywordColor)
-  protected def valDefText(text: Text): Text = coloredText(text, SyntaxHighlighting.ValDefColor)
+  protected def valDefText(text: Text): Text = coloredText(text, SyntaxHighlighting.DefinitionColor)
   protected def typeText(text: Text): Text = coloredText(text, SyntaxHighlighting.TypeColor)
   protected def literalText(text: Text): Text = coloredText(text, SyntaxHighlighting.LiteralColor)
-  protected def stringText(text: Text): Text = coloredText(text, SyntaxHighlighting.StringColor)
 
   protected def coloredStr(text: String, color: String): String =
     if (ctx.useColors) color + text + SyntaxHighlighting.NoColor else text

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -598,7 +598,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case tree @ Inlined(call, bindings, body) =>
         val bodyText = if bindings.isEmpty then toText(body) else blockText(bindings :+ body)
         if homogenizedView || !ctx.settings.XprintInline.value then bodyText
-        else if tree.inlinedFromOuterScope then stringText("{{") ~ stringText("/* inlined from outside */") ~ bodyText ~ stringText("}}")
+        else if tree.inlinedFromOuterScope then literalText("{{") ~ literalText("/* inlined from outside */") ~ bodyText ~ literalText("}}")
         else keywordText("{{") ~ keywordText("/* inlined from ") ~ toText(call) ~ keywordText(" */") ~ bodyText ~ keywordText("}}")
       case tpt: untpd.DerivedTypeTree =>
         "<derived typetree watching " ~ tpt.watched.showSummary() ~ ">"

compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

@@ -26,11 +26,9 @@ object SyntaxHighlighting {
   val NoColor: String         = Console.RESET
   val CommentColor: String    = Console.BLUE
   val KeywordColor: String    = Console.YELLOW
-  val ValDefColor: String     = Console.CYAN
+  val DefinitionColor: String = Console.CYAN
   val LiteralColor: String    = Console.GREEN
-  val StringColor: String     = Console.GREEN
-  val TypeColor: String       = Console.MAGENTA
-  val AnnotationColor: String = Console.MAGENTA
+  val TypeColor: String       = Console.GREEN
 
   def highlight(in: String)(using Context): String = {
     def freshCtx = ctx.fresh.setReporter(Reporter.NoReporter)
@@ -101,7 +99,7 @@ object SyntaxHighlighting {
 
         def highlightAnnotations(tree: MemberDef): Unit =
           for (annotation <- tree.rawMods.annotations)
-            highlightPosition(annotation.span, AnnotationColor)
+            highlightPosition(annotation.span, TypeColor)
 
         def highlight(trees: List[Tree])(using Context): Unit =
           trees.foreach(traverse)
@@ -112,14 +110,16 @@ object SyntaxHighlighting {
               ()
             case tree: ValOrDefDef =>
               highlightAnnotations(tree)
-              highlightPosition(tree.nameSpan, ValDefColor)
-              highlightPosition(tree.endSpan, ValDefColor)
+              highlightPosition(tree.nameSpan, DefinitionColor)
+              highlightPosition(tree.endSpan, DefinitionColor)
             case tree: MemberDef /* ModuleDef | TypeDef */ =>
               highlightAnnotations(tree)
-              highlightPosition(tree.nameSpan, TypeColor)
-              highlightPosition(tree.endSpan, TypeColor)
+              highlightPosition(tree.nameSpan, DefinitionColor)
+              highlightPosition(tree.endSpan, DefinitionColor)
             case tree: Ident if tree.isType =>
               highlightPosition(tree.span, TypeColor)
+            case tree: Select if tree.isType =>
+              highlightPosition(tree.nameSpan, TypeColor)
             case _: TypeTree =>
               highlightPosition(tree.span, TypeColor)
             case _ =>

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

@@ -48,10 +48,10 @@ class CheckShadowing extends MiniPhase:
 
   override def description: String = CheckShadowing.description
 
-  override def isEnabled(using Context): Boolean = ctx.settings.Wshadow.value.nonEmpty
+  override def isEnabled(using Context): Boolean = ctx.settings.WshadowHas.any
 
   override def isRunnable(using Context): Boolean =
-    super.isRunnable && ctx.settings.Wshadow.value.nonEmpty && !ctx.isJava
+    super.isRunnable && ctx.settings.WshadowHas.any && !ctx.isJava
 
   override def prepareForUnit(tree: tpd.Tree)(using Context): Context =
     val data = ShadowingData()