diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-04-14 01:17:08 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-04-14 01:17:08 -0700 |
| commit | 18509dc1137ff10c3c4d4b26c17ad32f51bbc403 (patch) | |
| tree | 4972374520e9dea618102730a7c8e6769a3d7853 | |
| parent | fc65423d8d6a7548393d212e17c8563cf40bcfc0 (diff) | |
| parent | 23dd325bdf9714bc4f2f804d30104d2d2a3ae595 (diff) | |
| download | scala-18509dc1137ff10c3c4d4b26c17ad32f51bbc403.tar.gz scala-18509dc1137ff10c3c4d4b26c17ad32f51bbc403.tar.bz2 scala-18509dc1137ff10c3c4d4b26c17ad32f51bbc403.zip | |
Merge pull request #2389 from retronym/ticket/7360
SI-7360 Don't let a follow-up TypeError obscure the original error.
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 7a67ac6246..aea3e0d930 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1180,7 +1180,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter) ("\n" + info1) :: info2 :: info3 mkString "\n\n" } - catch { case x: Exception => errorMessage } + catch { case _: Exception | _: TypeError => errorMessage } /** The id of the currently active run */ |