diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 08:42:11 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-13 11:45:02 +1000 |
| commit | 18e3e61778918e4e802b8fb75789635409523372 (patch) | |
| tree | 18d67da301f0b63667e9393d3e336b1fcb5e1875 /src/repl-jline/scala | |
| parent | b92c3aff1ab8c76c4816bd7b1a82a0f87d787837 (diff) | |
| parent | 52fde52920d93325310e5544991feeea03e5c763 (diff) | |
| download | scala-18e3e61778918e4e802b8fb75789635409523372.tar.gz scala-18e3e61778918e4e802b8fb75789635409523372.tar.bz2 scala-18e3e61778918e4e802b8fb75789635409523372.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150713
Conflicts:
src/eclipse/partest/.classpath
src/eclipse/repl/.classpath
test/files/run/nothingTypeNoFramesNoDce.scala
test/files/run/repl-javap-app.check
Also fixup two .classpath files with updated partest, xml and
parser combinators JARs.
Diffstat (limited to 'src/repl-jline/scala')
| -rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/FileBackedHistory.scala | 12 | ||||
| -rw-r--r-- | src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/repl-jline/scala/tools/nsc/interpreter/jline/FileBackedHistory.scala b/src/repl-jline/scala/tools/nsc/interpreter/jline/FileBackedHistory.scala index b6c9792ec0..53a06ca972 100644 --- a/src/repl-jline/scala/tools/nsc/interpreter/jline/FileBackedHistory.scala +++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/FileBackedHistory.scala @@ -7,9 +7,9 @@ package scala.tools.nsc.interpreter.jline import _root_.jline.console.history.PersistentHistory - import scala.tools.nsc.interpreter -import scala.tools.nsc.io.{File, Path} +import scala.reflect.io.{ File, Path } +import scala.tools.nsc.Properties.{ propOrNone, userHome } /** TODO: file locking. */ @@ -85,9 +85,9 @@ object FileBackedHistory { // val ContinuationChar = '\003' // val ContinuationNL: String = Array('\003', '\n').mkString - import scala.tools.nsc.Properties.userHome - - def defaultFileName = ".scala_history" + final val defaultFileName = ".scala_history" - def defaultFile: File = File(Path(userHome) / defaultFileName) + def defaultFile: File = File( + propOrNone("scala.shell.histfile") map (Path.apply) getOrElse (Path(userHome) / defaultFileName) + ) } diff --git a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala index 1f6a1f7022..3bc259252a 100644 --- a/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala +++ b/src/repl-jline/scala/tools/nsc/interpreter/jline/JLineHistory.scala @@ -15,7 +15,7 @@ import scala.tools.nsc.interpreter import scala.tools.nsc.interpreter.session.{History, SimpleHistory} -/** A straight scalification of the jline interface which mixes +/** A straight scalafication of the jline interface which mixes * in the sparse jline-independent one too. */ trait JLineHistory extends JHistory with History { |