1 files changed, 8 insertions, 17 deletions
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
index 8f7794fa90..4769705404 100644
--- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala
+++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala
@@ -78,27 +78,18 @@ trait Plugins {
 
     val plugs = pick(roughPluginsList, Set(), (phasesSet map (_.phaseName)).toSet)
 
-    /* Verify requirements are present. */
+    // Verify required plugins are present.
     for (req <- settings.require.value ; if !(plugs exists (_.name == req)))
       globalError("Missing required plugin: " + req)
 
-    /* Process plugin options. */
-    def namec(plug: Plugin) = plug.name + ":"
-    def optList(xs: List[String], p: Plugin) = xs filter (_ startsWith namec(p))
-    def doOpts(p: Plugin): List[String] =
-      optList(settings.pluginOptions.value, p) map (_ stripPrefix namec(p))
+    // Verify no non-existent plugin given with -P
+    for {
+      opt <- settings.pluginOptions.value
+      if !(plugs exists (opt startsWith _.name + ":"))
+    } globalError("bad option: -P:" + opt)
 
-    for (p <- plugs) {
-      val opts = doOpts(p)
-      if (!opts.isEmpty)
-        p.processOptions(opts, globalError)
-    }
-
-    /* Verify no non-existent plugin given with -P */
-    for (opt <- settings.pluginOptions.value ; if plugs forall (p => optList(List(opt), p).isEmpty))
-      globalError("bad option: -P:" + opt)
-
-    plugs
+    // Plugins may opt out, unless we just want to show info
+    plugs filter (p => p.init(p.options, globalError) || (settings.debug && settings.isInfo))
   }
 
   lazy val plugins: List[Plugin] = loadPlugins()