diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-16 13:32:56 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-16 13:32:56 +0200 |
| commit | f2e055f251d8c7169e8a84246d62d923fbcc8524 (patch) | |
| tree | 127949e3d24dd94e8b6c6fd18d2340b9a0260373 /src/compiler | |
| parent | 6b3c518667b13796ff41a2ad86041d2cd67b6fba (diff) | |
| parent | c32ba936ac4f7c0e9f815fadeec84294354567be (diff) | |
| download | scala-f2e055f251d8c7169e8a84246d62d923fbcc8524.tar.gz scala-f2e055f251d8c7169e8a84246d62d923fbcc8524.tar.bz2 scala-f2e055f251d8c7169e8a84246d62d923fbcc8524.zip | |
Merge pull request #4595 from som-snytt/issue/9370
SI-9370 Xplugin scans plugin path for descriptor
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/plugins/Plugin.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala index 1a5529140c..dd17750cd4 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala @@ -158,8 +158,8 @@ object Plugin { def loop(qs: List[Path]): Try[PluginDescription] = qs match { case Nil => Failure(new MissingPluginException(ps)) case p :: rest => - if (p.isDirectory) loadDescriptionFromFile(p.toDirectory / PluginXML) - else if (p.isFile) loadDescriptionFromJar(p.toFile) + if (p.isDirectory) loadDescriptionFromFile(p.toDirectory / PluginXML) orElse loop(rest) + else if (p.isFile) loadDescriptionFromJar(p.toFile) orElse loop(rest) else loop(rest) } loop(ps) |