Use directories to locate repl history

som-snytt · som-snytt · commit 2113d40ae61d · 2023-11-30T15:04:50.000-08:00
diff --git a/build.sbt b/build.sbt
@@ -43,6 +43,7 @@ val asmDep            = "org.scala-lang.modules"         % "scala-asm"
 val jlineDep          = "org.jline"                      % "jline"                            % versionProps("jline.version")
 val jnaDep            = "net.java.dev.jna"               % "jna"                              % versionProps("jna.version")
 val jlineDeps         = Seq(jlineDep, jnaDep)
+val directories       = "dev.dirs"                       % "directories"                      % "26"
 val testInterfaceDep  = "org.scala-sbt"                  % "test-interface"                   % "1.0"
 val diffUtilsDep      = "io.github.java-diff-utils"      % "java-diff-utils"                  % "4.12"
 val compilerInterfaceDep = "org.scala-sbt"               % "compiler-interface"               % "1.9.5"
@@ -491,6 +492,7 @@ lazy val compiler = configureAsSubproject(project)
     // These are only needed for the POM:
     // TODO: jline dependency is only needed for the REPL shell, which should move to its own jar
     libraryDependencies ++= jlineDeps,
+    libraryDependencies += directories,
     buildCharacterPropertiesFile := (Compile / resourceManaged).value / "scala-buildcharacter.properties",
     Compile / resourceGenerators += generateBuildCharacterPropertiesFile.map(file => Seq(file)).taskValue,
     // this a way to make sure that classes from interactive and scaladoc projects
@@ -548,6 +550,7 @@ lazy val compiler = configureAsSubproject(project)
                             |org.jline.terminal.spi;resolution:=optional
                             |org.jline.utils;resolution:=optional
                             |org.jline.builtins;resolution:=optional
+                            |dev.dirs;resolution:=optional
                             |scala.*;version="$${range;[==,=+);$${ver}}"
                             |*""".stripMargin.linesIterator.mkString(","),
       "Class-Path" -> "scala-reflect.jar scala-library.jar"
@@ -590,6 +593,7 @@ lazy val replFrontend = configureAsSubproject(project, srcdir = Some("repl-front
   .settings(publish / skip := true)
   .settings(
     libraryDependencies ++= jlineDeps,
+    libraryDependencies += directories,
     name := "scala-repl-frontend",
     Compile / scalacOptions ++= Seq("-Xlint"),
   )
@@ -1105,6 +1109,7 @@ lazy val scalaDist = Project("scalaDist", file(".") / "target" / "scala-dist-dis
     }.taskValue,
     Compile / managedResourceDirectories := Seq((Compile / resourceManaged).value),
     libraryDependencies ++= jlineDeps,
+    libraryDependencies += directories,
     apiURL := None,
     fixPom(
       "/project/name" -> <name>Scala Distribution Artifacts</name>,
@@ -1267,6 +1272,7 @@ lazy val dist = (project in file("dist"))
   .settings(
     bspEnabled := false,
     libraryDependencies ++= jlineDeps,
+    libraryDependencies += directories,
     mkBin := mkBinImpl.value,
     mkQuick := Def.task {
       val cp = (testP / IntegrationTest / fullClasspath).value
@@ -1280,12 +1286,11 @@ lazy val dist = (project in file("dist"))
     target := (ThisBuild / target).value / projectFolder.value,
     Compile / packageBin := {
       val targetDir = (ThisBuild / buildDirectory).value / "pack" / "lib"
-      val jlineJAR = findJar((Compile / dependencyClasspath).value, jlineDep).get.data
-      val jnaJAR = findJar((Compile / dependencyClasspath).value, jnaDep).get.data
-      val mappings = Seq(
-        (jlineJAR, targetDir / "jline.jar"),
-        (jnaJAR, targetDir / "jna.jar"),
-      )
+      val dcp = (Compile / dependencyClasspath).value
+      val jars = List("jline.jar" -> jlineDep, "jna.jar" -> jnaDep, "directories.jar" -> directories)
+      val mappings = jars.map {
+        case (filename, dep) => (findJar(dcp, dep).get.data, targetDir / filename)
+      }
       IO.copy(mappings, CopyOptions() withOverwrite true)
       targetDir
     },
diff --git a/project/Osgi.scala b/project/Osgi.scala
@@ -10,9 +10,10 @@ import VersionUtil.versionProperties
 
 /** OSGi packaging for the Scala build, distilled from sbt-osgi.
  *
- * We don't use sbt-osgi (yet) because it does not allow a crucial bit of
-  * configuration that we need: Setting the classpath for BND. In sbt-osgi this is always
-  * `fullClasspath in Compile` whereas we want `products in Compile in packageBin`. */
+ *  We don't use sbt-osgi (yet) because it does not allow a crucial bit of
+ *  configuration that we need: Setting the classpath for BND. In sbt-osgi this is always
+ * `fullClasspath in Compile` whereas we want `products in Compile in packageBin`.
+ */
 object Osgi {
   val bundle = TaskKey[File]("osgiBundle", "Create an OSGi bundle.")
   val bundleName = SettingKey[String]("osgiBundleName", "The Bundle-Name for the manifest.")
diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/ShellConfig.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/ShellConfig.scala
@@ -21,9 +21,9 @@ import scala.sys.Prop._
 import scala.tools.nsc.{Properties, GenericRunnerSettings, Settings}
 import scala.tools.nsc.Properties._
 
+import dev.dirs.ProjectDirectories
 
 object ShellConfig {
-  import scala.tools.nsc.Properties
 
   val EDITOR = Properties.envOrNone("EDITOR")
   val InterruptedString = Properties.shellInterruptedString
@@ -65,7 +65,14 @@ trait ShellConfig {
   // This property is used in TypeDebugging. Let's recycle it.
   val colorOk = Properties.coloredOutputEnabled
 
-  val historyFile = s"$userHome/.scala_history_jline3"
+  val datadir =
+    try {
+      val projectdirs = ProjectDirectories.from("org", "scala-lang", "repl2")
+      projectdirs.dataLocalDir
+    } catch {
+      case _: UnsupportedOperationException => userHome
+    }
+  val historyFile = s"$datadir/.scala_history"
 
   private val info  = bool("scala.repl.info")
   private val debug = bool("scala.repl.debug")
