Skip to content

Commit d335dad

Browse files
committed
[vm options] filter out the -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader option from the test VM option
The option comes from product-info.json from additionalJvmArguments
1 parent 28aaead commit d335dad

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

ideaSupport/src/main/scala/org/jetbrains/sbtidea/runIdea/IntellijVMOptionsBuilder.scala

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ final case class IntellijVMOptionsBuilder(
7878
}
7979
}
8080

81-
// TODO:
82-
// Consider deliting these in tests? (coming from additional options from product-info.json)
83-
// -Xbootclasspath/a:/Users/dmitrii.naumenko/.ScalaPluginIU/sdk/252.26199.7/lib/nio-fs.jar
84-
// -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader
8581
private def buildNew(
8682
options: CustomIntellijVMOptions,
8783
quoteValues: Boolean,
@@ -93,9 +89,18 @@ final case class IntellijVMOptionsBuilder(
9389
else line
9490

9591
// Escaping quotes. Example: `-Djdk.http.auth.tunneling.disabledSchemes=""`
96-
val defaultOptionsFromProductInfo =
92+
val defaultOptionsFromProductInfoOriginal =
9793
productInfoExtraDataProvider.vmOptionsAll.map(escapeQuotes)
9894

95+
val defaultOptionsFromProductInfoFiltered = if (forTests)
96+
defaultOptionsFromProductInfoOriginal.filterNot { optionLine =>
97+
// By default, the additional VM options contain these options that should not be in tests
98+
// -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader
99+
optionLine.startsWith("-Djava.system.class.loader=")
100+
}
101+
else
102+
defaultOptionsFromProductInfoOriginal
103+
99104
val extraOptions = mutable.ArrayBuffer[String]()
100105

101106
def qq(str: String): String =
@@ -173,7 +178,7 @@ final case class IntellijVMOptionsBuilder(
173178

174179
// NOTE: first go the default options, then extra options
175180
// Some extra options can potentially override the default (it depends on the concrete option, e.g. it can work for -Xmx)
176-
defaultOptionsFromProductInfo ++ extraOptions
181+
defaultOptionsFromProductInfoFiltered ++ extraOptions
177182
}
178183
}
179184

0 commit comments

Comments
 (0)