Skip to content

Commit aa9f568

Browse files
committed
Ensure only necessary environment variables are passed to BSP
1 parent 4205554 commit aa9f568

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import scala.build.bsp.IdeInputs
1414
import scala.build.errors.{BuildException, WorkspaceError}
1515
import scala.build.input.{Inputs, OnDisk, Virtual, WorkspaceOrigin}
1616
import scala.build.internal.Constants
17+
import scala.build.internals.EnvsUtil.EnvVar
1718
import scala.build.options.{BuildOptions, Scope}
1819
import scala.cli.CurrentParams
1920
import scala.cli.commands.shared.{SharedBspFileOptions, SharedOptions}
@@ -185,7 +186,8 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
185186
val scalaCliOptionsForBspJson = writeToArray(options.shared)(SharedOptions.jsonCodec)
186187
val scalaCliLaunchOptsForBspJson = writeToArray(launcherOptions)(LauncherOptions.jsonCodec)
187188
val scalaCliBspInputsJson = writeToArray(ideInputs)
188-
val scalaCliBspEnvsJson = writeToArray(sys.env)
189+
val envsForBsp = sys.env.filter((key, _) => EnvVar.allBsp.map(_.name).contains(key))
190+
val scalaCliBspEnvsJson = writeToArray(envsForBsp)
189191

190192
if (inputs.workspaceOrigin.contains(WorkspaceOrigin.HomeDir))
191193
value(Left(new WorkspaceError(

0 commit comments

Comments
 (0)