Merge pull request #2885 from som-snytt/issue/7791-script-linenums

SI-7791 Line number table reflects underlying file

3 files changed, 25 insertions, 0 deletions

diff --git a/test/files/run/t7791-script-linenums.check b/test/files/run/t7791-script-linenums.check
new file mode 100644
index 0000000000..b7d969564a
--- /dev/null
+++ b/test/files/run/t7791-script-linenums.check
@@ -0,0 +1 @@
+hello, scripted test
diff --git a/test/files/run/t7791-script-linenums.scala b/test/files/run/t7791-script-linenums.scala
new file mode 100644
index 0000000000..d89b8d4c63
--- /dev/null
+++ b/test/files/run/t7791-script-linenums.scala
@@ -0,0 +1,16 @@
+
+import scala.tools.partest.ScriptTest
+
+object Test extends ScriptTest {
+  object ExceptionLine {
+    def unapply(e: Exception) = Some(e.getStackTrace()(0).getLineNumber)
+  }
+  override def show() = {
+    import util._
+    Try(super.show()) match {
+      case Failure(ExceptionLine(7)) => ()
+      case Failure(e) => e.printStackTrace()
+      case Success(_) => Console println "Expected error"
+    }
+  }
+}
diff --git a/test/files/run/t7791-script-linenums.script b/test/files/run/t7791-script-linenums.script
new file mode 100644
index 0000000000..403dcc2d28
--- /dev/null
+++ b/test/files/run/t7791-script-linenums.script
@@ -0,0 +1,8 @@
+#!/bin/bash
+exec ${SCALA_HOME}/bin/scala "$0" "$@" 2>&1
+!#
+
+Console println s"hello, scripted test"
+
+throw new RuntimeException("failing")  // line 7
+