diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-08-26 11:59:03 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-08-26 11:59:03 +0200 |
| commit | 6ec0d70da83255ec4f9d1b81902ee60b0f5c6332 (patch) | |
| tree | 849584178888041a110af3a6f8d30a00eabe90ef | |
| parent | 3555e0ec840a7ab843794e53a17142bd6ee49d87 (diff) | |
| parent | 066d1026d9b5783d3358bc4389b2371cee00ed8c (diff) | |
| download | scala-6ec0d70da83255ec4f9d1b81902ee60b0f5c6332.tar.gz scala-6ec0d70da83255ec4f9d1b81902ee60b0f5c6332.tar.bz2 scala-6ec0d70da83255ec4f9d1b81902ee60b0f5c6332.zip | |
Merge pull request #3943 from gourlaysama/wip/fsc
SI-1264 SI-5227 fsc isn't very good at returning error messages
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileServer.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/CompileSocket.scala | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala index 1f3a4237eb..029e1c4629 100644 --- a/src/compiler/scala/tools/nsc/CompileServer.scala +++ b/src/compiler/scala/tools/nsc/CompileServer.scala @@ -152,6 +152,7 @@ class StandardCompileServer extends SocketServer { clearCompiler() case ex: Throwable => warn("Compile server encountered fatal condition: " + ex) + reporter.error(null, "Compile server encountered fatal condition: " + ex.getMessage) shutdown = true throw ex } diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala index c4f06b59ec..c693fbe8e2 100644 --- a/src/compiler/scala/tools/nsc/CompileSocket.scala +++ b/src/compiler/scala/tools/nsc/CompileSocket.scala @@ -32,7 +32,8 @@ trait HasCompileSocket { if (isErrorMessage(line)) noErrors = false - compileSocket.echo(line) + // be consistent with scalac: everything goes to stderr + compileSocket.warn(line) loop() } try loop() |