summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-07 01:37:26 +0000
committerPaul Phillips <paulp@improving.org>2010-12-07 01:37:26 +0000
commitd46e72721f578caaaf4d55060c0a1a9d531641e7 (patch)
tree4a163758db044d0edcdf72029ff28d45ae36a7f2 /src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
parent7806112e43776fc812c93ec9cabd5cbd1953c4a6 (diff)
downloadscala-d46e72721f578caaaf4d55060c0a1a9d531641e7.tar.gz
scala-d46e72721f578caaaf4d55060c0a1a9d531641e7.tar.bz2
scala-d46e72721f578caaaf4d55060c0a1a9d531641e7.zip
Tired of trying to debug things like classpaths...
Tired of trying to debug things like classpaths only to see output like the following: [search path for class files: /System/classes/you/already/know:/Importan...] I added a "do not truncate" mechanism to reporter and put it to use. Now scala -verbose will let you in on those classpath secrets. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala')
-rw-r--r--src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index 11ef7ffb68..ccc3cb27dd 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -22,6 +22,9 @@ abstract class AbstractReporter extends Reporter {
}
val settings: Settings
+ private def isVerbose = settings.verbose.value
+ private def noWarnings = settings.nowarnings.value
+ private def isPromptSet = settings.prompt.value
def display(pos: Position, msg: String, severity: Severity): Unit
def displayPrompt: Unit
@@ -31,27 +34,22 @@ abstract class AbstractReporter extends Reporter {
if (settings.Xwarnfatal.value && _severity == WARNING) ERROR
else _severity
- severity match {
- case INFO =>
- if (force || settings.verbose.value) display(pos, msg, severity)
- case WARNING =>
- val hidden = testAndLog(pos, severity)
- if (!settings.nowarnings.value) {
- if (!hidden || settings.prompt.value) display(pos, msg, severity)
- if (settings.prompt.value) displayPrompt
- }
- case ERROR =>
- val hidden = testAndLog(pos, severity)
- if (!hidden || settings.prompt.value) display(pos, msg, severity)
- if (settings.prompt.value) displayPrompt
+ if (severity == INFO) {
+ if (isVerbose || force)
+ display(pos, msg, severity)
+ }
+ else {
+ val hidden = testAndLog(pos, severity)
+ if (severity == WARNING && noWarnings) ()
+ else {
+ if (!hidden || isPromptSet) display(pos, msg, severity)
+ if (isPromptSet) displayPrompt
+ }
}
}
- /** Logs a position and returns <code>true</code> if it was already logged.
+ /** Logs a position and returns true if it was already logged.
* @note Two positions are considered identical for logging if they have the same point.
- *
- * @param pos ...
- * @return <code>true</code> if <code>pos</code> was already logged.
*/
private def testAndLog(pos: Position, severity: Severity): Boolean =
pos != null && pos.isDefined && {