Skip to content
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

Add a hint for using CC with REPL #22220

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Add a hint for using CC with REPL #22220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecccfc9
Add hint when found cc language import in repl
Linyxus Dec 16, 2024
958371c
Refine the hint
Linyxus Dec 16, 2024
2e409e1
Fix the description
Linyxus Dec 16, 2024
c79b212
Add repl tests
Linyxus Dec 16, 2024
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
10 changes: 9 additions & 1 deletion compiler/src/dotty/tools/dotc/parsing/Parsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3706,7 +3706,15 @@ object Parsers {
in.languageImportContext = in.languageImportContext.importContext(imp, NoSymbol)
for case ImportSelector(id @ Ident(imported), EmptyTree, _) <- selectors do
if Feature.handleGlobalLanguageImport(prefix, imported) && !outermost then
syntaxError(em"this language import is only allowed at the toplevel", id.span)
val desc =
if ctx.mode.is(Mode.Interactive) then
"not allowed in the REPL"
else "only allowed at the toplevel"
val hint =
if ctx.mode.is(Mode.Interactive) then
f"\nTo use this language feature, include the flag `-language:$prefix.$imported` when starting the REPL"
else ""
syntaxError(em"this language import is $desc$hint", id.span)
if allSourceVersionNames.contains(imported) && prefix.isEmpty then
if !outermost then
syntaxError(em"source version import is only allowed at the toplevel", id.span)
Expand Down
18 changes: 18 additions & 0 deletions compiler/test/dotty/tools/repl/ReplCompilerTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,24 @@ class ReplCompilerTests extends ReplTest:
assertTrue(all.head.startsWith("-- [E103] Syntax Error"))
assertTrue(all.exists(_.trim().startsWith("| Illegal start of statement: this modifier is not allowed here")))

@Test def `i16250a`: Unit = initially:
val hints = List(
"this language import is not allowed in the REPL",
"To use this language feature, include the flag `-language:experimental.captureChecking` when starting the REPL"
)
run("import language.experimental.captureChecking")
val all = lines()
assertTrue(hints.forall(hint => all.exists(_.contains(hint))))

@Test def `i16250b`: Unit = initially:
val hints = List(
"this language import is not allowed in the REPL",
"To use this language feature, include the flag `-language:experimental.pureFunctions` when starting the REPL"
)
run("import language.experimental.pureFunctions")
val all = lines()
assertTrue(hints.forall(hint => all.exists(_.contains(hint))))

object ReplCompilerTests:

private val pattern = Pattern.compile("\\r[\\n]?|\\n");
Expand Down
Loading