upgrade scala-repl-pp (joernio#5131)

https://github.com/mpollmeier/scala-repl-pp now has two separate concepts: 
1) predefFiles which are being compiled and loaded into the classpath - for these we will now get correct line numbers if there's any compilation errors. 
2) runBefore code which is executed before the console and/or script is executed - this is e.g. for things like import statements etc. which we need to bring the joern dsl into scope

.github/workflows/pr.yml

@@ -97,7 +97,8 @@ jobs:
       - run: |
           mkdir /tmp/slice
           ./joern-slice data-flow tests/code/javasrc/SliceTest.java -o /tmp/slice/dataflow-slice-javasrc.json
-          ./joern --script "./test-dataflow-slice.sc" --param sliceFile=/tmp/slice/dataflow-slice-javasrc.json | grep -q 'List(boolean b, b, this, s, "MALICIOUS", s, new Foo("MALICIOUS"), s, s, "SAFE", s, b, this, this, b, s, System.out)'
+          echo "checking that the script output contains the content we expect:"
+          ./joern --script "tests/test-dataflow-slice.sc" --param sliceFile=/tmp/slice/dataflow-slice-javasrc.json | grep 'List(boolean b, b, this, s, "MALICIOUS", s, new Foo("MALICIOUS"), s, s, "SAFE", s, b, this, this, b, s, System.out)'
       - run: |
           cd joern-cli/target/universal/stage
           ./schema-extender/test.sh

console/src/main/scala/io/joern/console/BridgeBase.scala

@@ -211,14 +211,21 @@ trait BridgeBase extends InteractiveShell with ScriptExecution with PluginHandli
     }
   }
 
-  protected def createPredefFile(additionalLines: Seq[String] = Nil): Path = {
-    val tmpFile = Files.createTempFile("joern-predef", "sc")
-    Files.write(tmpFile, (predefLines ++ additionalLines).asJava)
-    tmpFile.toAbsolutePath
-  }
-
   /** code that is executed on startup */
-  protected def predefLines: Seq[String]
+  protected def runBeforeCode: Seq[String]
+
+  protected def buildRunBeforeCode(config: Config): Seq[String] = {
+    val builder = Seq.newBuilder[String]
+    config.cpgToLoad.foreach { cpgFile =>
+      builder += s"""importCpg("$cpgFile")"""
+    }
+    config.forInputPath.foreach { name =>
+      builder += s"""openForInputPath("$name")""".stripMargin
+    }
+    builder ++= config.additionalImports.map(_.toString)
+    builder ++= runBeforeCode
+    builder.result()
+  }
 
   protected def greeting: String
 
@@ -229,19 +236,9 @@ trait BridgeBase extends InteractiveShell with ScriptExecution with PluginHandli
 
 trait InteractiveShell { this: BridgeBase =>
   protected def startInteractiveShell(config: Config) = {
-    val replConfig = config.cpgToLoad.map { cpgFile =>
-      "importCpg(\"" + cpgFile + "\")"
-    } ++ config.forInputPath.map { name =>
-      s"""
-         |openForInputPath(\"$name\")
-         |""".stripMargin
-    }
-
-    val predefFile = createPredefFile(replConfig.toSeq)
-
     replpp.InteractiveShell.run(
       replpp.Config(
-        predefFiles = predefFile +: config.additionalImports,
+        runBefore = buildRunBeforeCode(config),
         nocolors = config.nocolors,
         verbose = config.verbose,
         classpathConfig = replpp.Config
@@ -268,10 +265,9 @@ trait ScriptExecution { this: BridgeBase =>
     if (!Files.exists(scriptFile)) {
       Try(throw new AssertionError(s"given script file `$scriptFile` does not exist"))
     } else {
-      val predefFile = createPredefFile(importCpgCode(config))
       val scriptReturn = ScriptRunner.exec(
         replpp.Config(
-          predefFiles = predefFile +: config.additionalImports,
+          runBefore = buildRunBeforeCode(config),
           scriptFile = Option(scriptFile),
           command = config.command,
           params = config.params,
@@ -286,18 +282,6 @@ trait ScriptExecution { this: BridgeBase =>
       scriptReturn
     }
   }
-
-  /** For the given config, generate a list of commands to import the CPG
-    */
-  private def importCpgCode(config: Config): List[String] = {
-    config.cpgToLoad.map { cpgFile =>
-      "importCpg(\"" + cpgFile + "\")"
-    }.toList ++ config.forInputPath.map { name =>
-      s"""
-         |openForInputPath(\"$name\")
-         |""".stripMargin
-    }
-  }
 }
 
 trait PluginHandling { this: BridgeBase =>
@@ -406,10 +390,8 @@ trait PluginHandling { this: BridgeBase =>
 trait ServerHandling { this: BridgeBase =>
 
   protected def startHttpServer(config: Config): Unit = {
-    val predefFile = createPredefFile(Nil)
-
     val baseConfig = replpp.Config(
-      predefFiles = predefFile +: config.additionalImports,
+      runBefore = buildRunBeforeCode(config),
       verbose = true, // always print what's happening - helps debugging
       classpathConfig = replpp.Config
         .ForClasspath(inheritClasspath = true, dependencies = config.dependencies, resolvers = config.resolvers)

joern-cli/src/main/scala/io/joern/joerncli/JoernScan.scala

@@ -12,7 +12,6 @@ import io.shiftleft.codepropertygraph.generated.Languages
 import io.shiftleft.semanticcpg.language.{DefaultNodeExtensionFinder, NodeExtensionFinder}
 import io.shiftleft.semanticcpg.layers.{LayerCreator, LayerCreatorContext, LayerCreatorOptions}
 
-import java.io.PrintStream
 import org.json4s.native.Serialization
 import org.json4s.{Formats, NoTypeHints}
 
@@ -239,12 +238,10 @@ object JoernScan extends BridgeBase {
     }
   }
 
-  override protected def predefLines = ReplBridge.predefLines
-  override protected def promptStr   = ReplBridge.promptStr
-
-  override protected def greeting = ReplBridge.greeting
-
-  override protected def onExitCode = ReplBridge.onExitCode
+  override protected def runBeforeCode = ReplBridge.runBeforeCode
+  override protected def promptStr     = ReplBridge.promptStr
+  override protected def greeting      = ReplBridge.greeting
+  override protected def onExitCode    = ReplBridge.onExitCode
 }
 
 object Scan {

joern-cli/src/main/scala/io/joern/joerncli/console/ReplBridge.scala

@@ -1,7 +1,6 @@
 package io.joern.joerncli.console
 
 import io.joern.console.BridgeBase
-import java.io.PrintStream
 
 object ReplBridge extends BridgeBase {
 
@@ -13,8 +12,7 @@ object ReplBridge extends BridgeBase {
 
   /** Code that is executed when starting the shell
     */
-  override def predefLines =
-    Predefined.forInteractiveShell
+  override def runBeforeCode = RunBeforeCode.forInteractiveShell
 
   override def greeting = JoernConsole.banner()
 

joern-cli/src/main/scala/io/joern/joerncli/console/Predefined.scala → joern-cli/src/main/scala/io/joern/joerncli/console/RunBeforeCode.scala

@@ -2,7 +2,7 @@ package io.joern.joerncli.console
 
 import io.joern.console.{Help, Run}
 
-object Predefined {
+object RunBeforeCode {
 
   val shared: Seq[String] =
     Seq(

project/Versions.scala

@@ -30,7 +30,7 @@ object Versions {
   val requests               = "0.8.0"
   val scalaParallel          = "1.0.4"
   val scalaParserCombinators = "2.4.0"
-  val scalaReplPP            = "0.1.87"
+  val scalaReplPP            = "0.3.1"
   val scalatest              = "3.2.18"
   val scopt                  = "4.1.0"
   val semverParser           = "0.0.6"

tests/test-main.sc

@@ -0,0 +1,5 @@
+@main def main() = {
+  println("Hello, world!")
+  println(help) // should work, comes from joern commands
+  // val i: Int = "foo" // to test line number reporting
+}

tests/test-simple.sc

@@ -0,0 +1,3 @@
+println("Hello, world2!")
+println(help) // should work, comes from joern commands
+// val i: Int = "foo" // to test line number reporting