refactor a lil.

kivikakk · May 18, 2024 · d88b5d4 · d88b5d4
1 parent 1419fbe
commit d88b5d4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/src/main/scala/ee/hrzn/chryse/tasks/BaseTask.scala b/src/main/scala/ee/hrzn/chryse/tasks/BaseTask.scala
@@ -7,6 +7,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.security.MessageDigest
 import java.util.HexFormat
+import scala.jdk.CollectionConverters._
 import scala.sys.process._
 
 abstract class BaseTask {
@@ -60,6 +61,14 @@ abstract class BaseTask {
     run.foreach(_.markUpToDate())
   }
 
+  protected def filesInDirWithExt(dir: String, ext: String): Iterator[String] =
+    Files
+      .walk(Paths.get(dir), 1)
+      .iterator
+      .asScala
+      .map(_.toString)
+      .filter(_.endsWith(ext))
+
   case class CompilationUnit(
       val primaryInPath: Option[String],
       val otherInPaths: Seq[String],

diff --git a/src/main/scala/ee/hrzn/chryse/tasks/CxxsimTask.scala b/src/main/scala/ee/hrzn/chryse/tasks/CxxsimTask.scala
@@ -14,7 +14,6 @@ import java.io.PrintWriter
 import java.nio.file.Files
 import java.nio.file.Paths
 import scala.collection.mutable
-import scala.jdk.CollectionConverters._
 import scala.sys.process._
 
 object CxxsimTask extends BaseTask {
@@ -116,10 +115,7 @@ object CxxsimTask extends BaseTask {
 
     val cwd = System.getProperty("user.dir")
     writePath(s"$buildDir/compile_commands.json") { wr =>
-      upickle.default.writeTo(
-        cus.map(cu => ClangdEntry(cwd, cu.primaryInPath.get, cu.cmd)),
-        wr,
-      )
+      upickle.default.writeTo(cus.map(ClangdEntry(_)), wr)
     }
 
     runCus("compilation", cus)
@@ -152,21 +148,17 @@ object CxxsimTask extends BaseTask {
     }
   }
 
-  private def filesInDirWithExt(dir: String, ext: String): Iterator[String] =
-    Files
-      .walk(Paths.get(dir), 1)
-      .iterator
-      .asScala
-      .map(_.toString)
-      .filter(_.endsWith(ext))
-}
+  private case class ClangdEntry(
+      directory: String,
+      file: String,
+      arguments: Seq[String],
+  )
 
-private case class ClangdEntry(
-    directory: String,
-    file: String,
-    arguments: Seq[String],
-)
-private object ClangdEntry {
-  implicit val rw: upickle.default.ReadWriter[ClangdEntry] =
-    upickle.default.macroRW
+  private object ClangdEntry {
+    def apply(cu: CompilationUnit): ClangdEntry =
+      ClangdEntry(System.getProperty("user.dir"), cu.primaryInPath.get, cu.cmd)
+
+    implicit val rw: upickle.default.ReadWriter[ClangdEntry] =
+      upickle.default.macroRW
+  }
 }