diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-07-01 16:12:51 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-07-01 16:12:51 +0200 |
| commit | e67146c6e8758b070f6ce4eeb43d289980bfe51a (patch) | |
| tree | 814bd435652e0f20dbe1b22e1917e25a4ca27ff2 | |
| parent | 1feda983171fd59297c211e5c466fab8880652ee (diff) | |
| parent | 5d63ef31c16511df5ce9cbda5d07fd7672844ae2 (diff) | |
| download | scala-e67146c6e8758b070f6ce4eeb43d289980bfe51a.tar.gz scala-e67146c6e8758b070f6ce4eeb43d289980bfe51a.tar.bz2 scala-e67146c6e8758b070f6ce4eeb43d289980bfe51a.zip | |
Merge pull request #3836 from gourlaysama/wip/t8292
SI-8292 report error when scaladoc fails to find doclet.
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/DocFactory.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/DocFactory.scala b/src/scaladoc/scala/tools/nsc/doc/DocFactory.scala index dce52af56a..47ddfb8aa9 100644 --- a/src/scaladoc/scala/tools/nsc/doc/DocFactory.scala +++ b/src/scaladoc/scala/tools/nsc/doc/DocFactory.scala @@ -95,11 +95,11 @@ class DocFactory(val reporter: Reporter, val settings: doc.Settings) { processor val documentError: PartialFunction[Throwable, Unit] = { case NoCompilerRunException => reporter.info(null, "No documentation generated with unsuccessful compiler run", force = false) - case _: ClassNotFoundException => - () + case e @ (_:ClassNotFoundException | _:IllegalAccessException | _:InstantiationException | _:SecurityException | _:ClassCastException) => + reporter.error(null, s"Cannot load the doclet class ${settings.docgenerator.value} (specified with ${settings.docgenerator.name}): $e. Leaving the default settings will generate the html version of scaladoc.") } - /** Generate document(s) for all `files` containing scaladoc documenataion. + /** Generate document(s) for all `files` containing scaladoc documentation. * @param files The list of paths (relative to the compiler's source path, or absolute) of files to document. */ def document(files: List[String]) { def generate() = { |