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

Default to a Scala version for REPL if there are no Scala artifacts. #2431

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Default to a Scala version for REPL if there are no Scala artifacts. #2431

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
c525b47
Default to a Scala version for REPL if there are no Scala artifacts.
trilleplay Sep 27, 2023
85f3140
Introduce a test for making sure running REPL without Scala artifacts…
trilleplay Sep 28, 2023
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
9 changes: 4 additions & 5 deletions modules/cli/src/main/scala/scala/cli/commands/repl/Repl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,10 @@ object Repl extends ScalaCommand[ReplOptions] {
val cache = options.internal.cache.getOrElse(FileCache())
val shouldUseAmmonite = options.notForBloopOptions.replOptions.useAmmonite

val scalaParams = artifacts.scalaOpt
.getOrElse {
sys.error("Expected Scala artifacts to be fetched")
}
.params
val scalaParams = artifacts.scalaOpt match {
case Some(artifacts) => artifacts.params
case None => ScalaParameters(Constants.defaultScalaVersion)
}

val (scalapyJavaOpts, scalapyExtraEnv) =
if (setupPython) {
Expand Down
17 changes: 17 additions & 0 deletions modules/integration/src/test/scala/scala/cli/integration/ReplTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,21 @@ class ReplTests extends ScalaCliSuite {
expect(output.contains("parser") && output.contains("typer"))
}

test("calling repl with a directory with no scala artifacts") {
val inputs = TestInputs(
os.rel / "Testing.java" -> "public class Testing {}"
)
val cmd = Seq[os.Shellable](
TestUtil.cli,
"repl",
"--repl-dry-run",
"."
)
inputs.fromRoot { root =>
val res = os.proc(cmd)
.call(cwd = root)
expect(res.exitCode == 0)
}
}

}