Skip to content

Backport "chore: filter allowed source versions by import and by settings" to 3.7.1 #23231

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 2 commits into from
May 22, 2025
Merged

Backport "chore: filter allowed source versions by import and by settings" to 3.7.1 #23231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8c8f29
chore: filter allowed source versions by import and by settings
hamzaremmal May 21, 2025
05d2d32
chore: add `3.1-migration` in the compiler
hamzaremmal May 21, 2025
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
3 changes: 2 additions & 1 deletion compiler/src/dotty/tools/dotc/config/ScalaSettingsProperties.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ object ScalaSettingsProperties:
ScalaRelease.values.toList.map(_.show)

def supportedSourceVersions: List[String] =
(SourceVersion.values.toList.diff(SourceVersion.illegalSourceVersionNames)).toList.map(_.toString)
SourceVersion.values.diff(SourceVersion.illegalInSettings)
.map(_.toString).toList

def supportedLanguageFeatures: List[ChoiceWithHelp[String]] =
Feature.values.map((n, d) => ChoiceWithHelp(n.toString, d))
Expand Down
15 changes: 12 additions & 3 deletions compiler/src/dotty/tools/dotc/config/SourceVersion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import Feature.isPreviewEnabled
import util.Property

enum SourceVersion:
case `3.0-migration`, `3.0`, `3.1` // Note: do not add `3.1-migration` here, 3.1 is the same language as 3.0.
case `3.0-migration`, `3.0`
case `3.1-migration`, `3.1`
case `3.2-migration`, `3.2`
case `3.3-migration`, `3.3`
case `3.4-migration`, `3.4`
Expand Down Expand Up @@ -40,10 +41,18 @@ enum SourceVersion:
def enablesBetterFors(using Context) = isAtLeast(`3.7`) && isPreviewEnabled

object SourceVersion extends Property.Key[SourceVersion]:
def defaultSourceVersion = `3.7`

/* The default source version used by the built compiler */
val defaultSourceVersion = `3.7`

/* Illegal source versions that may not appear in the settings `-source:<...>` */
val illegalInSettings = List(`3.1-migration`, `never`)

/* Illegal source versions that may not appear as an import `import scala.language.<...>` */
val illegalInImports = List(`3.1-migration`, `never`)

/** language versions that may appear in a language import, are deprecated, but not removed from the standard library. */
val illegalSourceVersionNames = List("3.1-migration", "never").map(_.toTermName)
val illegalSourceVersionNames = illegalInImports.map(_.toString.toTermName)

/** language versions that the compiler recognises. */
val validSourceVersionNames = values.toList.map(_.toString.toTermName)
Expand Down
7 changes: 7 additions & 0 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 @@ -299,4 +299,11 @@ class ScalaSettingsTests:
)
assertEquals(result, Right(reporting.Action.Error))

@Test def `illegal source versions are not accepted when parsing the settings`: Unit =
for source <- SourceVersion.illegalInSettings do
val settings = ScalaSettings
val result = settings.processArguments(List("-source", source.toString()), true)
assertEquals(0, result.warnings.length)
assertEquals(1, result.errors.length)

end ScalaSettingsTests
Loading