Permalink
Browse files

closes #100: Remove special treatment for continuations plugin

  • Loading branch information...
1 parent 1421025 commit 1816d4d2ab8861ba8016b7045dd86952aea3f825 Heiko Seeberger committed Apr 16, 2012
@@ -313,19 +313,16 @@ private object Eclipse {
def scalacOptions(ref: ProjectRef, state: State): Validation[Seq[(String, String)]] =
evaluateTask(Keys.scalacOptions, ref, state) map (options =>
- if (options.isEmpty) Nil
+ if (options.isEmpty)
+ Nil
else {
- def pluginValues(value: String) =
- value split "," map (_.trim) filterNot (_ contains "org.scala-lang.plugins/continuations")
options.zipAll(options.tail, "-", "-") collect {
- case (SettingFormat("Xplugin", value), _) if !pluginValues(value).isEmpty =>
- "Xplugin" -> (pluginValues(value) mkString ",")
case (SettingFormat(key, value), next) if next startsWith "-" =>
key -> (if (!value.isEmpty) value else "true")
case (SettingFormat(key, _), next) =>
key -> next
} match {
- case Nil => Nil
+ case Seq() => Seq()
case options => ("scala.compiler.useProjectSettings" -> "true") +: options
}
}
@@ -168,7 +168,6 @@ TaskKey[Unit]("verify-settings") <<= baseDirectory map { dir =>
"scala.compiler.useProjectSettings" -> "true",
"unchecked" -> "true",
"deprecation" -> "true",
- "Xplugin" -> "foo",
"Xelide-below" -> "0"
)
if (settings != expected) error("Expected settings to be '%s', but was '%s'!".format(expected, settings))
@@ -59,7 +59,7 @@ object Build extends Build {
"junit" % "junit" % "4.7" % "it"
),
retrieveManaged := true,
- scalacOptions := Seq("-unchecked", "-deprecation", "-Xelide-below", "0", "-Xplugin:foo,org.scala-lang.plugins/continuations"),
+ scalacOptions := Seq("-unchecked", "-deprecation", "-Xelide-below", "0"),
EclipseKeys.configurations := Set(Configurations.Compile, Configurations.IntegrationTest)
),
dependencies = Seq(suba, suba % "test->compile", subc % "test->test")

0 comments on commit 1816d4d

Please sign in to comment.