Add encoding to main class name

VirtusLab · May 23, 2023 · 14b8f8b · 14b8f8b
1 parent 68541d5
commit 14b8f8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/core/src/main/scala/scala/build/internals/Name.scala b/modules/core/src/main/scala/scala/build/internals/Name.scala
@@ -12,7 +12,7 @@ case class Name(raw: String) {
   assert(raw.charAt(0) != '`', "Cannot create already-backticked identifiers")
   override def toString = s"Name($backticked)"
   def encoded           = NameTransformer.encode(raw)
-  def backticked        = Name.backtickWrap(raw)
+  def backticked        = Name.backtickWrap(encoded)
 }
 
 object Name {

diff --git a/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala
@@ -531,7 +531,7 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
           """//> using dep "com.lihaoyi::os-lib:0.9.1"
             |@main def main(args: String*): Unit = println("Hello")
             |""".stripMargin,
-        os.rel / "script_with_directive.sc" ->
+        os.rel / "script-with-directive.sc" ->
           """//> using dep "com.lihaoyi::os-lib:0.9.1"
             |//> using object.wrapper
             |@main def main(args: String*): Unit = println("Hello")
@@ -547,7 +547,7 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
           "[warn]  Annotation @main in .sc scripts is not supported, it will be ignored, use .scala format instead"
         ))
 
-        val directiveRes = os.proc(TestUtil.cli, "--power", "script_with_directive.sc")
+        val directiveRes = os.proc(TestUtil.cli, "--power", "script-with-directive.sc")
           .call(cwd = root, mergeErrIntoOut = true, stdout = os.Pipe)
 
         val directiveOutputNormalized: String = normalizeConsoleOutput(directiveRes.out.text())