Skip to content

Commit 9f95620

Browse files
authored
Fallback to UTF-8 in setup-ide (#2599)
1 parent 9385014 commit 9f95620

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

modules/cli/src/main/scala/scala/cli/commands/setupide/SetupIde.scala

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import ch.epfl.scala.bsp4j.BspConnectionDetails
55
import com.github.plokhotnyuk.jsoniter_scala.core.*
66
import com.google.gson.GsonBuilder
77

8-
import java.nio.charset.Charset
8+
import java.nio.charset.{Charset, StandardCharsets}
99

1010
import scala.build.EitherCps.{either, value}
1111
import scala.build.*
@@ -160,11 +160,12 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
160160
List("scala", "java").asJava
161161
)
162162

163-
val charset = options.charset
164-
.map(_.trim)
165-
.filter(_.nonEmpty)
166-
.map(Charset.forName)
167-
.getOrElse(Charset.defaultCharset()) // Should it be UTF-8?
163+
val charset =
164+
options.charset
165+
.map(_.trim)
166+
.filter(_.nonEmpty)
167+
.map(Charset.forName)
168+
.getOrElse(StandardCharsets.UTF_8)
168169

169170
val gson = new GsonBuilder().setPrettyPrinting().create()
170171

0 commit comments

Comments
 (0)