diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-05-24 08:21:56 +0200 |
---|---|---|
committer | Som Snytt <som.snytt@gmail.com> | 2016-05-24 04:48:33 -0700 |
commit | b462e5a97b499bc91222014e45ec2439f56b46b7 (patch) | |
tree | af3e30974b40acf38bf18ac482531d233439c8c4 /test | |
parent | 5450ae6102eaeb8ec0f9b524bf43ac5f604b5074 (diff) | |
download | scala-b462e5a97b499bc91222014e45ec2439f56b46b7.tar.gz scala-b462e5a97b499bc91222014e45ec2439f56b46b7.tar.bz2 scala-b462e5a97b499bc91222014e45ec2439f56b46b7.zip |
SI-7898 Label for parsing -i sources
Text-based REPL pre-parses, so use the current label for errors.
Diffstat (limited to 'test')
-rwxr-xr-x | test/files/run/repl-paste-parse.check | 6 | ||||
-rw-r--r-- | test/files/run/repl-paste-parse.scala | 27 | ||||
-rw-r--r-- | test/files/run/repl-paste-parse.script | 1 |
3 files changed, 34 insertions, 0 deletions
diff --git a/test/files/run/repl-paste-parse.check b/test/files/run/repl-paste-parse.check new file mode 100755 index 0000000000..7b2148dc74 --- /dev/null +++ b/test/files/run/repl-paste-parse.check @@ -0,0 +1,6 @@ +Type in expressions for evaluation. Or try :help. + +scala> repl-paste-parse.script:1: error: illegal start of simple pattern +val case = 9 + ^ +:quit diff --git a/test/files/run/repl-paste-parse.scala b/test/files/run/repl-paste-parse.scala new file mode 100644 index 0000000000..e93ad4d02b --- /dev/null +++ b/test/files/run/repl-paste-parse.scala @@ -0,0 +1,27 @@ + +import java.io.{ BufferedReader, StringReader, StringWriter, PrintWriter } + +import scala.tools.partest.DirectTest +import scala.tools.nsc.interpreter.ILoop +import scala.tools.nsc.GenericRunnerSettings + +object Test extends DirectTest { + override def extraSettings = s"-usejavacp -i $scriptPath" + def scriptPath = testPath.changeExtension("script") + override def newSettings(args: List[String]) = { + val ss = new GenericRunnerSettings(Console.println) + ss.processArguments(args, true) + ss + } + def code = "" + def show() = { + val r = new BufferedReader(new StringReader("")) + val w = new StringWriter + val p = new PrintWriter(w, true) + new ILoop(r, p).process(settings) + w.toString.lines foreach { s => + if (!s.startsWith("Welcome to Scala")) println(s) + } + } +} + diff --git a/test/files/run/repl-paste-parse.script b/test/files/run/repl-paste-parse.script new file mode 100644 index 0000000000..903f6e7b0c --- /dev/null +++ b/test/files/run/repl-paste-parse.script @@ -0,0 +1 @@ +val case = 9 |