summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-08-17 07:35:37 -0700
committerPaul Phillips <paulp@improving.org>2013-08-17 08:22:53 -0700
commit0be0b99414ae54f1f4fbc7c7bc0e36e3ada20289 (patch)
tree7bca55ca53b386888db5d85ded6b4ac36988dc1e /src/compiler
parente76507f8793cd025b56ba2a0c3b0cc112bcc8aea (diff)
downloadscala-0be0b99414ae54f1f4fbc7c7bc0e36e3ada20289.tar.gz
scala-0be0b99414ae54f1f4fbc7c7bc0e36e3ada20289.tar.bz2
scala-0be0b99414ae54f1f4fbc7c7bc0e36e3ada20289.zip
Remedied glaring omission in error output.
Catching an assert and providing beautifully formatted contextual information is a questionable service if you forget to provide the error message from the assert.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala2
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 bfc4aefe06..9123733d49 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -1112,7 +1112,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
"symbol owners" -> ownerChainString(sym),
"call site" -> (site.fullLocationString + " in " + site.enclosingPackage)
)
- ("\n" + info1) :: info2 :: context_s :: Nil mkString "\n\n"
+ ("\n " + errorMessage + "\n" + info1) :: info2 :: context_s :: Nil mkString "\n\n"
}
catch { case _: Exception | _: TypeError => errorMessage }
}