Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use project-specific compiler settings when evaluating a worksheet. #175

Merged
merged 1 commit into from
Feb 11, 2014
Merged

Use project-specific compiler settings when evaluating a worksheet. #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions org.scalaide.worksheet/src/org/scalaide/worksheet/runtime/ResidentCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ object ResidentCompiler extends HasLogger {
val bootClasspathArgs: String = scalaClassPath.scalaLib.get.toFile.getAbsolutePath
val jrePath = scalaClassPath.jdkPaths.map(_.toFile)

// FIXME: We are currently ignoring the project's settings, which is bad. (What if the user wants to enable
// continuations in the worksheet!)
val args = List("-bootclasspath", bootClasspathArgs,
"-javabootclasspath", jrePath.map(_.getAbsolutePath).mkString(File.pathSeparator),
"-classpath", (WorksheetPlugin.worksheetLibrary.map(_.toOSString()).toSeq ++ scalaClassPath.userCp.map(_.toFile.getAbsolutePath)).mkString(File.pathSeparator),
"-d", worksheetConfig.binFolder.getAbsolutePath())

logger.debug("Compilation arguments: " + args)
// scalacArguments returns all project settings (but not user classpath, nor output directory)
val args = scalaProject.scalacArguments ++ Seq(
"-classpath", (WorksheetPlugin.worksheetLibrary.map(_.toOSString()).toSeq ++ scalaClassPath.userCp.map(_.toFile.getAbsolutePath)).mkString(File.pathSeparator),
"-d", worksheetConfig.binFolder.getAbsolutePath())

logger.debug("Compilation arguments: " + args.mkString("\n"))
new ResidentCompiler(args)
}

Expand All @@ -34,11 +32,11 @@ object ResidentCompiler extends HasLogger {
case class CompilationError(msg: String, pos: Position)
}

class ResidentCompiler private (arguments: List[String]) extends HasLogger {
class ResidentCompiler private (arguments: Seq[String]) extends HasLogger {
import ResidentCompiler._

private val reporter = new StoreReporter()
private val settings = new Settings(println(_)) // FIXME: This should really use the `scalaProject` settings (otherwise, how to enable continuations?)
private val settings = new Settings(println(_))
private val compiler = new scala.tools.nsc.Global(settings, reporter)

def compile(source: File): CompilationResult = this.synchronized {
Expand All @@ -52,10 +50,10 @@ class ResidentCompiler private (arguments: List[String]) extends HasLogger {
}

private def runCompilation(source: File): Unit = {
val sourcePath = source.getAbsolutePath()
logger.debug("compiling " + sourcePath)
val sources = source.getAbsolutePath()
logger.debug("compiling " + sources)

val command = new CompilerCommand(sourcePath :: arguments, settings)
val command = new CompilerCommand(sources :: arguments.toList, settings)
val run = new compiler.Run()
logger.info("compiling: " + command.files)
run compile command.files
Expand Down