diff options
| author | Som Snytt <som.snytt@gmail.com> | 2015-06-30 11:15:50 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2015-06-30 11:15:50 -0700 |
| commit | c32ba936ac4f7c0e9f815fadeec84294354567be (patch) | |
| tree | 244634c1f25b3616dc800b89d279976a3bd3ac10 /src/compiler/scala/tools/nsc/plugins | |
| parent | 12f92b7f0566a9557dbb8d73bba21b72764eed68 (diff) | |
| download | scala-c32ba936ac4f7c0e9f815fadeec84294354567be.tar.gz scala-c32ba936ac4f7c0e9f815fadeec84294354567be.tar.bz2 scala-c32ba936ac4f7c0e9f815fadeec84294354567be.zip | |
SI-9370 Xplugin scans plugin path for descriptor
Keep on scanning if the first entry doesn't yield
a plugin.xml descriptor.
Diffstat (limited to 'src/compiler/scala/tools/nsc/plugins')
| -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) |