Merge pull request scala#10708 from som-snytt/tweak/wconf

-Wconf:x,y is -Wconf:x -Wconf:y

Author: SethTisue

src/compiler/scala/tools/nsc/Reporting.scala

@@ -515,6 +515,7 @@ object Reporting {
     def includes(o: WarningCategory): Boolean = this eq o
     def summaryCategory: WarningCategory = this
     lazy val name: String = WarningCategory.nameOf(this)
+    override def toString = name
   }
 
   object WarningCategory {
@@ -717,7 +718,7 @@ object Reporting {
   }
 
   object MessageFilter {
-    object Any extends MessageFilter {
+    case object Any extends MessageFilter {
       def matches(message: Message): Boolean = true
     }
 
@@ -763,7 +764,9 @@ object Reporting {
     }
   }
 
-  sealed trait Action
+  sealed trait Action {
+    override def toString = s"Action[${getClass.getSimpleName.stripSuffix("$")}]"
+  }
 
   object Action {
     object Error extends Action

src/compiler/scala/tools/nsc/settings/MutableSettings.scala

@@ -701,7 +701,7 @@ class MutableSettings(val errorFn: String => Unit, val pathFactory: PathFactory)
     }
 
     def tryToSet(args: List[String])                  = tryToSetArgs(args, halting = true)
-    def tryToSetColon(args: List[String])    = tryToSetArgs(args, halting = false)
+    def tryToSetColon(args: List[String])             = tryToSetArgs(args, halting = false)
     override def tryToSetFromPropertyValue(s: String) = tryToSet(s.trim.split(',').toList) // used from ide
 
     /** Try to set args, handling "help" and default.
@@ -823,12 +823,12 @@ class MutableSettings(val errorFn: String => Unit, val pathFactory: PathFactory)
         case Nil                                  => (seen, Nil)
       }
       val (seen, rest) = loop(Nil, args)
-      if (prepend) value = value.prependedAll(seen.reverse)
+      if (prepend) value = value.prependedAll(seen)
       else value = value.appendedAll(seen.reverse)
       Some(rest)
     }
     def tryToSet(args: List[String])                  = tryToSetArgs(args, halting = true)
-    def tryToSetColon(args: List[String])    = tryToSetArgs(args, halting = false)
+    def tryToSetColon(args: List[String])             = tryToSetArgs(args, halting = false)
     override def tryToSetFromPropertyValue(s: String) = tryToSet(s.trim.split(',').toList) // used from ide
 
     def clear(): Unit         = (v = Nil)

src/compiler/scala/tools/nsc/settings/Warnings.scala

@@ -82,8 +82,13 @@ trait Warnings {
          |The default configuration is:
          |  -Wconf:${WconfDefault.mkString(",")}
          |
-         |User-defined configurations are added to the left. The leftmost rule matching
-         |a warning message defines the action.
+         |Under -Xsource:3-cross, the category of scala3-migration warnings are errors by default:
+         |  -Wconf:cat=scala3-migration:e
+         |Under -Xsource:3-migration, they are warnings:
+         |  -Wconf:cat=scala3-migration:w
+         |
+         |User-defined configurations override previous settings, such that the last matching
+         |configuration defines the action for a given diagnostic message.
          |
          |Examples:
          |  - change every warning into an error: -Wconf:any:error

test/junit/scala/tools/nsc/reporters/WConfTest.scala

@@ -215,8 +215,8 @@ class WConfTest extends BytecodeTesting {
   def lint(): Unit = {
     check(infos(code, "cat=lint:i"), Nil)
     check(infos(code, "cat=lint:i", lint = true), List(l2, l23))
-    check(reports(code, "any:s,cat=lint:ws", lint = true), Nil)
-    check(reports(code, "cat=lint:ws,any:s", lint = true), List((-1, "2 lint warnings")))
+    check(reports(code, "any:s,cat=lint:ws", lint = true), List((-1, "2 lint warnings")))
+    check(reports(code, "cat=lint:ws,any:s", lint = true), Nil)
     check(infos(code, "cat=lint-deprecation:i", lint = true), List(l2))
     check(infos(code, "cat=lint-adapted-args:i", lint = true), List(l23))
   }