diff options
author | Christoffer Sawicki <christoffer.sawicki@gmail.com> | 2013-08-11 21:04:29 +0200 |
---|---|---|
committer | Christoffer Sawicki <christoffer.sawicki@gmail.com> | 2013-08-19 23:51:18 +0200 |
commit | 470c69928fe2bbf41c3142ac066c49fb7a0ee7c9 (patch) | |
tree | 918a7b7176bbe0429c8abf8c98dbd3fd84748de2 /src/repl | |
parent | a124ab7f48dfc1e49b203af7a14904eaa5029577 (diff) | |
download | scala-470c69928fe2bbf41c3142ac066c49fb7a0ee7c9.tar.gz scala-470c69928fe2bbf41c3142ac066c49fb7a0ee7c9.tar.bz2 scala-470c69928fe2bbf41c3142ac066c49fb7a0ee7c9.zip |
SI-7740 Trim stack trace before printing in REPL
Diffstat (limited to 'src/repl')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/IMain.scala | 16 | ||||
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Naming.scala | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala index ae318697ec..f6e5f2115b 100644 --- a/src/repl/scala/tools/nsc/interpreter/IMain.scala +++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala @@ -7,6 +7,8 @@ package scala package tools.nsc package interpreter +import PartialFunction.cond + import scala.language.implicitConversions import scala.collection.mutable @@ -20,7 +22,7 @@ import scala.reflect.internal.util.{ BatchSourceFile, SourceFile } import scala.tools.util.PathResolver import scala.tools.nsc.io.AbstractFile import scala.tools.nsc.typechecker.{ TypeStrings, StructuredTypeStrings } -import scala.tools.nsc.util.{ ScalaClassLoader, stringFromWriter } +import scala.tools.nsc.util.{ ScalaClassLoader, stringFromWriter, stackTracePrefixString } import scala.tools.nsc.util.Exceptional.unwrap import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine, ScriptEngineFactory, ScriptException, CompiledScript, Compilable} @@ -728,10 +730,18 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set throw t val unwrapped = unwrap(t) + + // Example input: $line3.$read$$iw$$iw$ + val classNameRegex = (naming.lineRegex + ".*").r + def isWrapperInit(x: StackTraceElement) = cond(x.getClassName) { + case classNameRegex() if x.getMethodName == nme.CONSTRUCTOR.decoded => true + } + val stackTrace = util.stackTracePrefixString(unwrapped)(!isWrapperInit(_)) + withLastExceptionLock[String]({ directBind[Throwable]("lastException", unwrapped)(StdReplTags.tagOfThrowable, classTag[Throwable]) - util.stackTraceString(unwrapped) - }, util.stackTraceString(unwrapped)) + stackTrace + }, stackTrace) } // TODO: split it out into a package object and a regular diff --git a/src/repl/scala/tools/nsc/interpreter/Naming.scala b/src/repl/scala/tools/nsc/interpreter/Naming.scala index 7f577b3a8b..cf38a2ae3a 100644 --- a/src/repl/scala/tools/nsc/interpreter/Naming.scala +++ b/src/repl/scala/tools/nsc/interpreter/Naming.scala @@ -40,7 +40,7 @@ trait Naming { // $line3.$read$$iw$$iw$Bippy@4a6a00ca private def noMeta(s: String) = "\\Q" + s + "\\E" - private lazy val lineRegex = { + lazy val lineRegex = { val sn = sessionNames val members = List(sn.read, sn.eval, sn.print) map noMeta mkString ("(?:", "|", ")") debugging("lineRegex")(noMeta(sn.line) + """\d+[./]""" + members + """[$.]""") |