Skip to content

Backport "fix: reversed wconf parsing order to mirror scala 2" to LTS #21985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Backport "fix: reversed wconf parsing order to mirror scala 2" to LTS #21985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/reporting/WConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ object WConf:
def fromSettings(settings: List[String]): Either[List[String], WConf] =
if (settings.isEmpty) Right(WConf(Nil))
else
val parsedConfs: List[Either[List[String], (List[MessageFilter], Action)]] = settings.map(conf =>
val parsedConfs: List[Either[List[String], (List[MessageFilter], Action)]] = settings.reverse.map(conf =>
val filtersAndAction = conf.split(':')
if filtersAndAction.length != 2 then Left(List("exactly one `:` expected (<filter>&...&<filter>:<action>)"))
else
Expand Down
2 changes: 0 additions & 2 deletions compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ class ScalaSettingsTests:
val nowr = new Diagnostic.Warning("This is a problem.".toMessage, util.NoSourcePosition)
assertEquals(Action.Silent, sut.action(nowr))

@Ignore("LTS backport rejected: https://github.com/scala/scala3/pull/18503")
@Test def `i18367 rightmost WConf flags take precedence over flags to the left`: Unit =
import reporting.{Action, Diagnostic}
val sets = new ScalaSettings
Expand Down Expand Up @@ -186,7 +185,6 @@ class ScalaSettingsTests:
)
)

@Ignore("LTS backport rejected: https://github.com/scala/scala3/pull/18503")
@Test def `WConf src filter can be mixed with other filters with rightmost taking precedence`: Unit =
val result = wconfSrcFilterTest(
argsStr = "-Wconf:src=.*:s,cat=deprecation:e",
Expand Down