summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2016-02-25 13:41:20 -0800
committerSom Snytt <som.snytt@gmail.com>2016-05-20 17:01:34 -0700
commit99dad60d984d3f72338f3bad4c4fe905090edd51 (patch)
treec70abab26b1116869e02606abac1167232ab28f4 /src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
parent0d0671ae10ef552d66861248fa087306c960520e (diff)
downloadscala-99dad60d984d3f72338f3bad4c4fe905090edd51.tar.gz
scala-99dad60d984d3f72338f3bad4c4fe905090edd51.tar.bz2
scala-99dad60d984d3f72338f3bad4c4fe905090edd51.zip
SI-7898 Read user input during REPL warmup
The compiler is created on main thread and user input is read on an aux thread (opposite to currently). Fixes completion when `-i` is supplied. Now `-i` means pasted and new option `-I` means line-by-line. The temporary reader uses postInit to swap in the underlying reader. Completion is disabled for the temporary reader, rather than blocking while it waits for a compiler. But manically hitting tab is one way of knowing exactly when completion is live.
Diffstat (limited to 'src/compiler/scala/tools/nsc/GenericRunnerSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerSettings.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
index 1289d55c37..d1f8db048b 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerSettings.scala
@@ -21,9 +21,15 @@ class GenericRunnerSettings(error: String => Unit) extends Settings(error) {
val loadfiles =
MultiStringSetting(
+ "-I",
+ "file",
+ "load a file line-by-line")
+
+ val pastefiles =
+ MultiStringSetting(
"-i",
"file",
- "load a file (assumes the code is given interactively)")
+ "paste a file")
val execute =
StringSetting(