small adjustments

scalameta · Jun 20, 2024 · aa360aa · aa360aa
1 parent ad0f68d
commit aa360aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/...a/meta/internal/metals/H2Connection.scala → ...nternal/metals/H2ConnectionProvider.scala b/...a/meta/internal/metals/H2Connection.scala → ...nternal/metals/H2ConnectionProvider.scala
@@ -22,7 +22,7 @@ import org.h2.mvstore.MVStoreException
 import org.h2.tools.Upgrade
 
 abstract class H2ConnectionProvider(
-    directory: () => AbsolutePath,
+    directory: => AbsolutePath,
     name: String,
     migrations: String,
 ) extends Cancelable {
@@ -33,7 +33,7 @@ abstract class H2ConnectionProvider(
 
   protected def connection: Connection = connect()
 
-  protected def optDirectory: Option[AbsolutePath] = Try(directory()).toOption
+  protected def optDirectory: Option[AbsolutePath] = Try(directory).toOption
   protected def databasePath: Option[AbsolutePath] =
     optDirectory.map(_.resolve("metals.h2.db"))
 
@@ -92,9 +92,9 @@ abstract class H2ConnectionProvider(
     val autoServer =
       if (isAutoServer) ";AUTO_SERVER=TRUE"
       else ""
-    val dbfile = directory().resolve("metals")
+    val dbfile = directory.resolve("metals")
     // from "h2" % "2.0.206" the only option is the MVStore, which uses `metals.mv.db` file
-    val oldDbfile = directory().resolve("metals.h2.db")
+    val oldDbfile = directory.resolve("metals.h2.db")
     if (oldDbfile.exists) {
       scribe.info(s"Deleting old database format $oldDbfile")
       oldDbfile.delete()

diff --git a/metals/src/main/scala/scala/meta/internal/metals/SqlSharedIndices.scala b/metals/src/main/scala/scala/meta/internal/metals/SqlSharedIndices.scala
@@ -6,9 +6,10 @@ import scala.meta.io.AbsolutePath
 
 class SqlSharedIndices
     extends H2ConnectionProvider(
-      () => AbsolutePath(Paths.get(sys.props("user.home"))).resolve(".metals"),
-      "metals-shared",
-      "/shared-db/migration",
+      directory =
+        AbsolutePath(Paths.get(sys.props("user.home"))).resolve(".metals"),
+      name = "metals-shared",
+      migrations = "/shared-db/migration",
     ) {
 
   val jvmTypeHierarchy: JarTypeHierarchy = new JarTypeHierarchy(() => connect)

diff --git a/metals/src/main/scala/scala/meta/internal/metals/Tables.scala b/metals/src/main/scala/scala/meta/internal/metals/Tables.scala
@@ -11,9 +11,9 @@ final class Tables(
     workspace: AbsolutePath,
     time: Time,
 ) extends H2ConnectionProvider(
-      () => workspace.resolve(".metals"),
-      "metals",
-      "/db/migration",
+      directory = workspace.resolve(".metals"),
+      name = "metals",
+      migrations = "/db/migration",
     ) {
 
   val jarSymbols = new JarTopLevels(() => connection)