diff --git a/platform/bootstrap/dev/src/org/jetbrains/intellij/build/devServer/JUnitDevMainKt.java b/platform/bootstrap/dev/src/org/jetbrains/intellij/build/devServer/JUnitDevMainKt.java index b3f0e5bd3ab2..f5e5c93fee97 100644 --- a/platform/bootstrap/dev/src/org/jetbrains/intellij/build/devServer/JUnitDevMainKt.java +++ b/platform/bootstrap/dev/src/org/jetbrains/intellij/build/devServer/JUnitDevMainKt.java @@ -42,7 +42,8 @@ public final class JUnitDevMainKt { if (jUnitStarterModule != null) System.setProperty("idea.dev.build.test.additional.modules", jUnitStarterModule); String testEntryPointModulePlugin = System.getProperty("idea.dev.build.test.entry.point.module") + ".plugin"; - System.setProperty("additional.modules", testEntryPointModulePlugin); + String additionalModules = System.getProperty("additional.modules"); + System.setProperty("additional.modules", (additionalModules != null ? additionalModules + "," : "") + testEntryPointModulePlugin); // separate method to not retain local variables like implClass if (!build(lookup, classLoader)) { diff --git a/platform/testFramework/junit5/eel/testResources/intellij.platform.testFramework.junit5.eel._test.xml b/platform/testFramework/junit5/eel/testResources/intellij.platform.testFramework.junit5.eel._test.xml index ef802baa81d2..5962d8e035c4 100644 --- a/platform/testFramework/junit5/eel/testResources/intellij.platform.testFramework.junit5.eel._test.xml +++ b/platform/testFramework/junit5/eel/testResources/intellij.platform.testFramework.junit5.eel._test.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt b/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt index e876e3dd1a96..2ca110acdc0d 100644 --- a/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt +++ b/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt @@ -23,7 +23,7 @@ import org.jetbrains.annotations.CheckReturnValue * Service to register and obtain [SystemPython]s */ @ApiStatus.NonExtendable -sealed interface SystemPythonService { +interface SystemPythonService { /** * The result of this function might be cached. Use [forceRefresh] to reload it forcibly. * @return system pythons installed on OS sorted by type, then by lang.level: in order from highest (hence, the first one is usually the best one) @@ -91,7 +91,7 @@ class SystemPython internal constructor(private val delegate: VanillaPythonWithL * Tool to install python on OS. */ @ApiStatus.NonExtendable -sealed interface PythonInstallerService { +interface PythonInstallerService { /** * Installs latest stable python on OS.