diff --git a/java/compiler/impl/src/com/intellij/compiler/server/EelBuildCommandLineBuilder.kt b/java/compiler/impl/src/com/intellij/compiler/server/EelBuildCommandLineBuilder.kt index 9427879bf47d..c5e277c930fd 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/EelBuildCommandLineBuilder.kt +++ b/java/compiler/impl/src/com/intellij/compiler/server/EelBuildCommandLineBuilder.kt @@ -20,7 +20,7 @@ import com.intellij.platform.eel.provider.asEelPath import com.intellij.platform.eel.provider.asNioPath import com.intellij.platform.eel.provider.getEelDescriptor import com.intellij.platform.eel.provider.routingPrefixes -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import com.intellij.platform.eel.provider.utils.EelPathUtils import com.intellij.platform.eel.provider.utils.forwardLocalServer import kotlinx.coroutines.CoroutineScope @@ -35,7 +35,7 @@ class EelBuildCommandLineBuilder(val project: Project, exePath: Path) : BuildCom private val logger = logger() } - private val eel: EelApi = exePath.getEelDescriptor().upgradeBlocking() + private val eel: EelApi = exePath.getEelDescriptor().toEelApiBlocking() private val commandLine = GeneralCommandLine().withExePath(exePath.toString()) private val workingDirectory: Path = getSystemSubfolder(BuildManager.SYSTEM_ROOT) diff --git a/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java index 52a6f8783bf3..6201d1d15da7 100644 --- a/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java +++ b/java/execution/impl/src/com/intellij/execution/configurations/JavaCommandLineState.java @@ -95,7 +95,7 @@ public abstract class JavaCommandLineState extends CommandLineState implements J var descriptor = EelProviderUtil.getEelDescriptor(vitrualFilePath); if (descriptor != LocalEelDescriptor.INSTANCE) { - var config = new EelTargetEnvironmentRequest.Configuration(EelProviderUtil.upgradeBlocking(descriptor)); + var config = new EelTargetEnvironmentRequest.Configuration(EelProviderUtil.toEelApiBlocking(descriptor)); addJavaLangConfig(config, Objects.requireNonNull(EelNioBridgeServiceKt.asEelPath(vitrualFilePath)).toString(), jdk); return config; } diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt index 1b15b0be6530..4badadc53c2f 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt @@ -474,7 +474,7 @@ class ProjectWizardJdkComboBox( sink[JDK_DOWNLOADER_EXT] = object : JdkDownloaderDialogHostExtension { override fun getEel(): EelApi { return runBlockingMaybeCancellable { - currentEelDescriptor?.upgrade() ?: localEel + currentEelDescriptor?.toEelApi() ?: localEel } } } @@ -532,7 +532,7 @@ private fun computeHelperJdks(registered: List): List() else ApplicationManager.getApplication().service() } -fun EelDescriptor.upgradeBlocking(): EelApi { +@Deprecated("Use toEelApiBlocking() instead", ReplaceWith("toEelApiBlocking()")) +fun EelDescriptor.upgradeBlocking(): EelApi = toEelApiBlocking() + +fun EelDescriptor.toEelApiBlocking(): EelApi { if (this === LocalEelDescriptor) return localEel - return runBlockingMaybeCancellable { upgrade() } + return runBlockingMaybeCancellable { toEelApi() } } data object LocalEelDescriptor : EelDescriptor { @@ -102,7 +105,7 @@ data object LocalEelDescriptor : EelDescriptor { } } - override suspend fun upgrade(): EelApi { + override suspend fun toEelApi(): EelApi { return localEel } } diff --git a/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelPathUtils.kt b/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelPathUtils.kt index 27bfca59945c..3dd986c7eb00 100644 --- a/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelPathUtils.kt +++ b/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelPathUtils.kt @@ -59,7 +59,7 @@ object EelPathUtils { } val projectFilePath = project.projectFilePath ?: return Files.createTempFile(prefix, suffix) return runBlockingMaybeCancellable { - val eel = Path.of(projectFilePath).getEelDescriptor().upgrade() + val eel = Path.of(projectFilePath).getEelDescriptor().toEelApi() val file = eel.fs.createTemporaryFile().suffix(suffix).prefix(prefix).deleteOnExit(deleteOnExit).getOrThrowFileSystemException() file.asNioPath() } @@ -72,7 +72,7 @@ object EelPathUtils { } val projectFilePath = project.projectFilePath ?: return Files.createTempDirectory(prefix) return runBlockingMaybeCancellable { - val eel = Path.of(projectFilePath).getEelDescriptor().upgrade() + val eel = Path.of(projectFilePath).getEelDescriptor().toEelApi() createTemporaryDirectory(eel, prefix) } } @@ -211,7 +211,7 @@ object EelPathUtils { } runBlockingMaybeCancellable { - service().transferIfNeeded(target.descriptor.upgrade(), source, fileAttributesStrategy) + service().transferIfNeeded(target.descriptor.toEelApi(), source, fileAttributesStrategy) } } is TransferTarget.Explicit -> { @@ -404,7 +404,7 @@ object EelPathUtils { // usually eel is already initialized to this moment @Suppress("RAW_RUN_BLOCKING") val api = runBlocking { - descriptor.upgrade() + descriptor.toEelApi() } val someEelPath = api.fs.user.home return someEelPath.asNioPath() diff --git a/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelProcessUtils.kt b/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelProcessUtils.kt index 4f05a38a2e7a..db64a17144d8 100644 --- a/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelProcessUtils.kt +++ b/platform/eel-provider/src/com/intellij/platform/eel/provider/utils/eelProcessUtils.kt @@ -79,7 +79,7 @@ suspend fun EelProcess.awaitProcessResult(): EelProcessExecutionResult { @ApiStatus.Internal @ApiStatus.Experimental suspend fun Path.exec(vararg args: String, timeout: Duration = Int.MAX_VALUE.days): EelProcessExecutionResult { - val process = getEelDescriptor().upgrade().exec.spawnProcess(pathString, *args).eelIt() + val process = getEelDescriptor().toEelApi().exec.spawnProcess(pathString, *args).eelIt() return withTimeoutOrNull(timeout) { process.awaitProcessResult() } ?: run { diff --git a/platform/eel/src/com/intellij/platform/eel/EelDescriptor.kt b/platform/eel/src/com/intellij/platform/eel/EelDescriptor.kt index f8cf6b2a82ae..955d4b1be5c5 100644 --- a/platform/eel/src/com/intellij/platform/eel/EelDescriptor.kt +++ b/platform/eel/src/com/intellij/platform/eel/EelDescriptor.kt @@ -45,7 +45,7 @@ interface EelDescriptorWithoutNativeFileChooserSupport : EelDescriptor * * You are free to compare and store [EelDescriptor]. * TODO: In the future, [EelDescriptor] may also be serializable. - * If you need to access the remote environment, you can use the method [upgrade], which can suspend for some time before returning a working instance of [EelApi] + * If you need to access the remote environment, you can use the method [toEelApi], which can suspend for some time before returning a working instance of [EelApi] */ interface EelDescriptor { @Deprecated("Use platform instead", ReplaceWith("platform")) @@ -60,9 +60,12 @@ interface EelDescriptor { */ val platform: EelPlatform + suspend fun toEelApi(): EelApi + /** * Retrieves an instance of [EelApi] corresponding to this [EelDescriptor]. * This method may run a container, so it could suspend for a long time. */ - suspend fun upgrade(): EelApi + @Deprecated("Use toEelApi() instead", replaceWith = ReplaceWith("toEelApi()")) + suspend fun upgrade(): EelApi = toEelApi() } diff --git a/platform/eel/tests/com/intellij/platform/eel/path/EelAbsolutePathTest.kt b/platform/eel/tests/com/intellij/platform/eel/path/EelAbsolutePathTest.kt index 3e5add066f41..005132977bc5 100644 --- a/platform/eel/tests/com/intellij/platform/eel/path/EelAbsolutePathTest.kt +++ b/platform/eel/tests/com/intellij/platform/eel/path/EelAbsolutePathTest.kt @@ -71,7 +71,7 @@ class EelAbsolutePathTest { } class DummyEelDescriptor(override val platform: EelPlatform) : EelDescriptor { - override suspend fun upgrade(): EelApi { + override suspend fun toEelApi(): EelApi { return Assertions.fail() } } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.kt index 7d3dbd0be2e5..e719214496df 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemJdkUtil.kt @@ -41,7 +41,7 @@ suspend fun SdkLookupProvider.resolveJdkInfo(project: Project?, projectSdk: Sdk? private suspend fun SdkLookupProvider.resolveJavaHomeJdkInfo(project: Project?): SdkInfo { val eelDescriptor = project?.getEelDescriptor() ?: LocalEelDescriptor - val eel = eelDescriptor.upgrade() + val eel = eelDescriptor.toEelApi() val environment = eel.exec.fetchLoginShellEnvVariables() val jdkPathEnvValue = environment[JAVA_HOME] if (jdkPathEnvValue == null) { diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java index 8304e04e728d..78d6871af0c2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java @@ -33,7 +33,7 @@ import java.util.List; import static com.intellij.openapi.projectRoots.impl.JavaHomeFinderEel.javaHomeFinderEel; import static com.intellij.platform.eel.provider.EelProviderUtil.getEelDescriptor; -import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking; +import static com.intellij.platform.eel.provider.EelProviderUtil.toEelApiBlocking; @ApiStatus.Internal public abstract class JavaHomeFinder { @@ -199,7 +199,7 @@ public abstract class JavaHomeFinder { } private static @Nullable Path defaultJavaLocationUsingEel(Path path) { - EelApi eel = upgradeBlocking(getEelDescriptor(path)); + EelApi eel = toEelApiBlocking(getEelDescriptor(path)); EelPlatform platform = eel.getPlatform(); String eelPath = null; if (platform instanceof EelPlatform.Windows) { diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderEel.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderEel.kt index 2910f8405095..d1718a587fbb 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderEel.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderEel.kt @@ -10,7 +10,7 @@ import com.intellij.platform.eel.* import com.intellij.platform.eel.fs.* import com.intellij.platform.eel.path.EelPath import com.intellij.platform.eel.provider.asNioPath -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import com.intellij.platform.eel.provider.utils.awaitProcessResult import com.intellij.platform.eel.provider.utils.stdoutString import com.intellij.util.suspendingLazy @@ -77,7 +77,7 @@ private class EelSystemInfoProvider(private val eel: EelApi) : JavaHomeFinder.Sy } internal fun javaHomeFinderEel(descriptor: EelDescriptor): JavaHomeFinderBasic { - val eel = descriptor.upgradeBlocking() + val eel = descriptor.toEelApiBlocking() val systemInfoProvider = EelSystemInfoProvider(eel) val parentFinder = when (eel.platform) { diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkAuto.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkAuto.kt index da2271cf9922..2ca1e2dde857 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkAuto.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkAuto.kt @@ -128,7 +128,7 @@ class JdkAuto : UnknownSdkResolver { } val eel = coroutineScope.suspendingLazy { - (project?.getEelDescriptor() ?: LocalEelDescriptor).upgrade() + (project?.getEelDescriptor() ?: LocalEelDescriptor).toEelApi() } @Deprecated("Remove when EelApi is stabilized") diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownload.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownload.kt index 92ee0ad94ea7..668b6be67aa9 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownload.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownload.kt @@ -26,7 +26,7 @@ import com.intellij.openapi.util.registry.Registry import com.intellij.platform.eel.EelApi import com.intellij.platform.eel.provider.LocalEelDescriptor import com.intellij.platform.eel.provider.getEelDescriptor -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.Nls import java.nio.file.Path @@ -132,7 +132,7 @@ class JdkDownload : SdkDownload { return null } else { - return (project?.getEelDescriptor() ?: LocalEelDescriptor).upgradeBlocking() + return (project?.getEelDescriptor() ?: LocalEelDescriptor).toEelApiBlocking() } } } diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownloadUtil.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownloadUtil.kt index ac8dfdd82511..503f0efc00e5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownloadUtil.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownloadUtil.kt @@ -30,7 +30,7 @@ object JdkDownloadUtil { suspend fun pickJdkItemAndPath(project: Project, filter: (JdkItem) -> Boolean): Pair? { val wsl = project.basePath?.let { WslPath.getDistributionByWindowsUncPath(it) } - val eel = if (Registry.`is`("java.home.finder.use.eel")) project.getEelDescriptor().upgrade() else null + val eel = if (Registry.`is`("java.home.finder.use.eel")) project.getEelDescriptor().toEelApi() else null val jdkPredicate = when { eel != null -> JdkPredicate.forEel(eel) wsl != null -> JdkPredicate.forWSL() diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkInstaller.kt b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkInstaller.kt index b02071001c93..1d5569612c6d 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkInstaller.kt +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkInstaller.kt @@ -30,7 +30,7 @@ import com.intellij.platform.eel.path.EelPath import com.intellij.platform.eel.provider.asEelPath import com.intellij.platform.eel.provider.asNioPath import com.intellij.platform.eel.provider.getEelDescriptor -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import com.intellij.platform.eel.provider.utils.awaitProcessResult import com.intellij.platform.eel.provider.utils.stderrString import com.intellij.platform.eel.provider.utils.stdoutString @@ -113,7 +113,7 @@ class JdkInstaller : JdkInstallerBase() { public override fun eelFromPath(targetDir: Path): OsAbstractionForJdkInstaller.Eel? = if (Registry.`is`("java.home.finder.use.eel")) EelForJdkInstallerImpl(runBlockingMaybeCancellable { - targetDir.getEelDescriptor().upgrade() + targetDir.getEelDescriptor().toEelApi() }) else null @@ -498,7 +498,7 @@ abstract class JdkInstallerBase { if (jdkPath == null) return null if (!jdkPath.isDirectory()) return null val predicate = when { - Registry.`is`("java.home.finder.use.eel") -> JdkPredicate.forEel(jdkPath.getEelDescriptor().upgradeBlocking()) + Registry.`is`("java.home.finder.use.eel") -> JdkPredicate.forEel(jdkPath.getEelDescriptor().toEelApiBlocking()) WslPath.isWslUncPath(jdkPath.toString()) -> JdkPredicate.forWSL() else -> JdkPredicate.default() } diff --git a/platform/platform-impl/eel/src/com/intellij/platform/ide/impl/wsl/WslEelProvider.kt b/platform/platform-impl/eel/src/com/intellij/platform/ide/impl/wsl/WslEelProvider.kt index 78bc66c1212a..7daf877c4e48 100644 --- a/platform/platform-impl/eel/src/com/intellij/platform/ide/impl/wsl/WslEelProvider.kt +++ b/platform/platform-impl/eel/src/com/intellij/platform/ide/impl/wsl/WslEelProvider.kt @@ -151,7 +151,7 @@ class WslEelProvider(private val coroutineScope: CoroutineScope) : EelProvider { data class WslEelDescriptor(val distribution: WSLDistribution, override val platform: EelPlatform) : EelDescriptor { - override suspend fun upgrade(): EelApi { + override suspend fun toEelApi(): EelApi { return distribution.getIjent() } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/util.kt b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/util.kt index 2336bae8b022..584606fa41ee 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/util.kt +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/util.kt @@ -37,7 +37,7 @@ internal fun readWholeFileIfNotTooLargeWithEel(path: Path): ByteArray? { } val api = map.computeIfAbsent(root) { runBlocking { - root.getEelDescriptor().upgrade() + root.getEelDescriptor().toEelApi() } } if (api is LocalEelApi) { diff --git a/platform/platform-tests/testSrc/com/intellij/execution/wsl/WSLDistributionTest.kt b/platform/platform-tests/testSrc/com/intellij/execution/wsl/WSLDistributionTest.kt index 34d2e5adcd7b..5a840eda38fc 100644 --- a/platform/platform-tests/testSrc/com/intellij/execution/wsl/WSLDistributionTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/execution/wsl/WSLDistributionTest.kt @@ -520,7 +520,7 @@ private class MockIjentApi(private val adapter: GeneralCommandLine, val rootUser get() = object : EelDescriptor { override val platform: EelPlatform = EelPlatform.Linux(EelPlatform.Arch.Unknown) - override suspend fun upgrade(): EelApi { + override suspend fun toEelApi(): EelApi { throw UnsupportedOperationException() } } diff --git a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java index 0839587048dd..df4ee6b59773 100644 --- a/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java +++ b/platform/platform-util-io/src/com/intellij/execution/configurations/GeneralCommandLine.java @@ -39,7 +39,7 @@ import java.util.function.Function; import static com.intellij.execution.util.ExecUtil.startProcessBlockingUsingEel; import static com.intellij.platform.eel.provider.EelProviderUtil.getEelDescriptor; -import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking; +import static com.intellij.platform.eel.provider.EelProviderUtil.toEelApiBlocking; /** * OS-independent way of executing external processes with complex parameters. @@ -479,11 +479,11 @@ public class GeneralCommandLine implements UserDataHolder { eelApi = null; } else if (getEelDescriptor(exePath) != LocalEelDescriptor.INSTANCE) { // fast check - eelApi = upgradeBlocking(getEelDescriptor(exePath)); + eelApi = toEelApiBlocking(getEelDescriptor(exePath)); } else if (workingDirectory != null) { if (getEelDescriptor(workingDirectory) != LocalEelDescriptor.INSTANCE) { // also try to compute non-local EelApi from working dir - eelApi = upgradeBlocking(getEelDescriptor(workingDirectory)); + eelApi = toEelApiBlocking(getEelDescriptor(workingDirectory)); } else { eelApi = null; diff --git a/platform/testFramework/junit5/eel/src/impl/EelTestDescriptor.kt b/platform/testFramework/junit5/eel/src/impl/EelTestDescriptor.kt index 88e7e2491217..10ea9350990f 100644 --- a/platform/testFramework/junit5/eel/src/impl/EelTestDescriptor.kt +++ b/platform/testFramework/junit5/eel/src/impl/EelTestDescriptor.kt @@ -7,7 +7,7 @@ import com.intellij.platform.eel.EelPlatform import com.intellij.platform.eel.path.EelPath internal class EelTestDescriptor(val id: String, override val platform: EelPlatform, val apiProvider: () -> EelApi) : EelDescriptor { - override suspend fun upgrade(): EelApi { + override suspend fun toEelApi(): EelApi { return apiProvider() } diff --git a/plugins/devkit/devkit-core/src/run/JUnitDevKitPatcher.java b/plugins/devkit/devkit-core/src/run/JUnitDevKitPatcher.java index 9de486116359..980b2beb92bb 100644 --- a/plugins/devkit/devkit-core/src/run/JUnitDevKitPatcher.java +++ b/plugins/devkit/devkit-core/src/run/JUnitDevKitPatcher.java @@ -160,7 +160,7 @@ public final class JUnitDevKitPatcher extends JUnitPatcher { var file = files.iterator().next(); String projectFilePath = Objects.requireNonNull(project.getProjectFilePath(), "Run configurations should not be invoked on the default project"); - EelApi eelApi = EelProviderUtil.upgradeBlocking(EelProviderUtil.getEelDescriptor(Path.of(projectFilePath))); + EelApi eelApi = EelProviderUtil.toEelApiBlocking(EelProviderUtil.getEelDescriptor(Path.of(projectFilePath))); OS targetOs = EelProviderUtil.systemOs(eelApi); try (var stream = file.getInputStream()) { JavaModuleOptions.readOptions(stream, targetOs).forEach(vm::add); diff --git a/plugins/gradle/java/src/util/GradleArtifactDownloader.kt b/plugins/gradle/java/src/util/GradleArtifactDownloader.kt index 92448f076e6a..8cab042ed294 100644 --- a/plugins/gradle/java/src/util/GradleArtifactDownloader.kt +++ b/plugins/gradle/java/src/util/GradleArtifactDownloader.kt @@ -58,7 +58,7 @@ object GradleArtifactDownloader { artifactNotation: String, projectPath: String, ): Path { - val eel = project.getEelDescriptor().upgrade() + val eel = project.getEelDescriptor().toEelApi() val taskOutputEelPath = createTaskOutputFile(eel) val taskOutputPath = taskOutputEelPath.asNioPath() try { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyNodeIndex.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyNodeIndex.kt index 521f31cc7f34..5a9e16136edb 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyNodeIndex.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/dependency/analyzer/GradleDependencyNodeIndex.kt @@ -66,7 +66,7 @@ class GradleDependencyNodeIndex( } private suspend fun collectDependencies(moduleData: GradleModuleData): DependencyNodes { - val eel = project.getEelDescriptor().upgrade() + val eel = project.getEelDescriptor().toEelApi() val taskOutputEelPath = eel.fs.createTemporaryFile() .prefix("$TASK_NAME-output") .getOrThrow() diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleUserHomeUtil.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleUserHomeUtil.kt index 861c0bd0ea8b..cdce413dcf4a 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleUserHomeUtil.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleUserHomeUtil.kt @@ -34,7 +34,7 @@ fun gradleUserHomeDir(descriptor: EelDescriptor): Path { return gradleUserHomeDir().toPath() } return runBlockingMaybeCancellable { - val eel = descriptor.upgrade() + val eel = descriptor.toEelApi() val env = eel.exec.fetchLoginShellEnvVariables() val gradleUserHome = env[GRADLE_USER_HOME_PROPERTY_KEY] ?: env[GRADLE_USER_HOME_ENV_KEY] if (gradleUserHome != null) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelGradleExecutionAware.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelGradleExecutionAware.kt index 2fc04644aea6..598f3376f270 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelGradleExecutionAware.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelGradleExecutionAware.kt @@ -43,7 +43,7 @@ class EelGradleExecutionAware : GradleExecutionAware { ): TargetEnvironmentConfigurationProvider? { return if (project.isEelSyncAvailable()) { runBlockingCancellable { - EelTargetEnvironmentConfigurationProvider(project.getEelDescriptor().upgrade(), project) + EelTargetEnvironmentConfigurationProvider(project.getEelDescriptor().toEelApi(), project) } } else { @@ -57,7 +57,7 @@ class EelGradleExecutionAware : GradleExecutionAware { ): TargetEnvironmentConfigurationProvider? { return if (project.isEelSyncAvailable()) { runBlockingCancellable { - EelTargetEnvironmentConfigurationProvider(project.getEelDescriptor().upgrade(), project) + EelTargetEnvironmentConfigurationProvider(project.getEelDescriptor().toEelApi(), project) } } else { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt index 1e95405ab9c3..cd17f98ff0fa 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/eel/EelTargetEnvironmentConfigurationProvider.kt @@ -73,7 +73,7 @@ class EelTargetEnvironmentConfigurationProvider(val eel: EelApi, val project: Pr } private suspend fun forwardToolingProxyPortOntoLocalMachine(port: Int): Int { - val eel = project.getEelDescriptor().upgrade() + val eel = project.getEelDescriptor().toEelApi() // the address to which all the request will be forwarded to // in this case port -- port of the tooling proxy val address = HostAddress.Builder(port.toUShort()) diff --git a/plugins/hg4idea/testData/bin/mercurial/upgrade.py b/plugins/hg4idea/testData/bin/mercurial/upgrade.py index 12d223c27107..f189f11f65e2 100644 --- a/plugins/hg4idea/testData/bin/mercurial/upgrade.py +++ b/plugins/hg4idea/testData/bin/mercurial/upgrade.py @@ -275,7 +275,7 @@ def upgraderepo( dstrepo = hg.repository(repoui, path=tmppath, create=True) with dstrepo.wlock(), dstrepo.lock(): - backuppath = upgrade_engine.upgrade( + backuppath = upgrade_engine.toEelApi( ui, repo, dstrepo, upgrade_op ) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java index d276aee81940..e9124ecaeb8f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenCommandLineState.java @@ -74,7 +74,7 @@ public class MavenCommandLineState extends JavaCommandLineState implements Remot if (eelDescriptor instanceof LocalEelDescriptor) { return null; } - EelApi eel = EelProviderUtil.upgradeBlocking(eelDescriptor); + EelApi eel = EelProviderUtil.toEelApiBlocking(eelDescriptor); EelTargetEnvironmentRequest.Configuration configuration = new EelTargetEnvironmentRequest.Configuration(eel); MavenRuntimeTargetResolver targetResolver = new MavenRuntimeTargetResolver(project, eel); MavenRuntimeTargetConfiguration runtimeTarget = targetResolver.resolve(myConfiguration); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenShCommandLineState.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenShCommandLineState.kt index a8156818ced4..fe6ed2c55c80 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenShCommandLineState.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/MavenShCommandLineState.kt @@ -67,7 +67,7 @@ class MavenShCommandLineState(val environment: ExecutionEnvironment, private val private fun startProcess(debug: Boolean): ProcessHandler { return runWithModalProgressBlocking(myConfiguration.project, RunnerBundle.message("maven.target.run.label")) { - val eelApi = myConfiguration.project.getEelDescriptor().upgrade() + val eelApi = myConfiguration.project.getEelDescriptor().toEelApi() val exe = if (isWindows()) "cmd.exe" else "/bin/sh" val env = getEnv(eelApi.exec.fetchLoginShellEnvVariables(), debug) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/target/MavenCommandLineSetup.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/target/MavenCommandLineSetup.kt index d0174e986276..87752948f020 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/target/MavenCommandLineSetup.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/target/MavenCommandLineSetup.kt @@ -123,7 +123,7 @@ class MavenCommandLineSetup( private suspend fun calculateJavaHome(): String? { val descriptor = project.getEelDescriptor() - val eel = descriptor.upgrade() + val eel = descriptor.toEelApi() val targetEnv = eel.exec.fetchLoginShellEnvVariables() val targetJavaHome = targetEnv[JAVA_HOME_ENV_KEY] if (targetJavaHome != null) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenWslTargetConfigurator.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenWslTargetConfigurator.kt index f0d79ab341ec..c776b036d5d1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenWslTargetConfigurator.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenWslTargetConfigurator.kt @@ -14,7 +14,7 @@ import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.UserDataHolder import com.intellij.platform.eel.provider.asEelPath import com.intellij.platform.eel.provider.getEelDescriptor -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import org.jetbrains.idea.maven.execution.target.MavenRuntimeTargetConfiguration import org.jetbrains.idea.maven.project.MavenInSpecificPath import org.jetbrains.idea.maven.project.MavenProjectBundle @@ -46,7 +46,7 @@ class MavenWslTargetConfigurator : MavenWorkspaceConfigurator { val wslDistribution = project.basePath?.let { project.tryGetWslDistribution() } ?: return dataHolder.putUserData(WSL_DISTRIBUTION, wslDistribution) - val eel = project.getEelDescriptor().upgradeBlocking() + val eel = project.getEelDescriptor().toEelApiBlocking() val distribution = eel.findMavenDistribution()?.asMavenDistribution() ?: project.getMavenUsedForSync() val mavenHome = distribution.mavenHome dataHolder.putUserData(MAVEN_HOME_DIR, mavenHome) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/eel/EelMavenRemoteProcessSupportFactory.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/eel/EelMavenRemoteProcessSupportFactory.kt index 16742cea2058..ea90194386f3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/eel/EelMavenRemoteProcessSupportFactory.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/eel/EelMavenRemoteProcessSupportFactory.kt @@ -25,7 +25,7 @@ class EelMavenRemoteProcessSupportFactory : MavenRemoteProcessSupportFactory { debugPort: Int?, ): MavenRemoteProcessSupport { trigger(project, MavenActionsUsagesCollector.START_WSL_MAVEN_SERVER) - val eel = project.getEelDescriptor().upgradeBlocking() + val eel = project.getEelDescriptor().toEelApiBlocking() return EelMavenServerRemoteProcessSupport(eel, jdk, vmOptions, mavenDistribution, project, debugPort) } @@ -42,7 +42,7 @@ class EelRemotePathTransformFactory : RemotePathTransformerFactory { } override fun createTransformer(project: Project): RemotePathTransformerFactory.Transformer { - val eel = project.getEelDescriptor().upgradeBlocking() + val eel = project.getEelDescriptor().toEelApiBlocking() return object : RemotePathTransformerFactory.Transformer { override fun toRemotePath(localPath: String): String { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEelUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEelUtil.kt index 804d1feba821..ef3eabc522b7 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEelUtil.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEelUtil.kt @@ -93,7 +93,7 @@ object MavenEelUtil { @JvmStatic suspend fun Project?.resolveM2DirAsync(): Path { - return this?.filterAcceptable()?.getEelDescriptor()?.upgrade().resolveM2Dir() + return this?.filterAcceptable()?.getEelDescriptor()?.toEelApi().resolveM2Dir() } suspend fun resolveUsingEel(project: Project?, ordinary: suspend () -> T, eel: suspend (EelApi) -> T?): T { @@ -101,7 +101,7 @@ object MavenEelUtil { MavenLog.LOG.error("resolveEelAware: Project is null") } - return project?.filterAcceptable()?.getEelDescriptor()?.upgrade()?.let { eel(it) } ?: ordinary.invoke() + return project?.filterAcceptable()?.getEelDescriptor()?.toEelApi()?.let { eel(it) } ?: ordinary.invoke() } private fun Project.filterAcceptable(): Project? = takeIf { !it.isDefault && it !is DummyProject } @@ -422,7 +422,7 @@ object MavenEelUtil { ) { project.service().coroutineScope.launch(Dispatchers.IO) { withBackgroundProgress(project, MavenProjectBundle.message("wsl.jdk.searching"), cancellable = false) { - val eel = project.getEelDescriptor().upgrade() + val eel = project.getEelDescriptor().toEelApi() val sdkPath = service().suggestHomePaths(project).firstOrNull() if (sdkPath != null) { edtWriteAction { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt index fe811c8a8c61..f18cf8aacc62 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.kt @@ -53,7 +53,7 @@ import com.intellij.platform.eel.provider.LocalEelDescriptor import com.intellij.platform.eel.provider.asNioPath import com.intellij.platform.eel.provider.getEelDescriptor import com.intellij.platform.eel.provider.localEel -import com.intellij.platform.eel.provider.upgradeBlocking +import com.intellij.platform.eel.provider.toEelApiBlocking import com.intellij.platform.eel.provider.utils.fetchLoginShellEnvVariablesBlocking import com.intellij.psi.PsiManager import com.intellij.serviceContainer.AlreadyDisposedException @@ -751,7 +751,7 @@ object MavenUtil { fun getSystemMavenHomeVariants(project: Project): MutableList { val result = ArrayList() - val eel = project.getEelDescriptor().upgradeBlocking() + val eel = project.getEelDescriptor().toEelApiBlocking() val envs = eel.exec.fetchLoginShellEnvVariablesBlocking() val m2home = envs.get(ENV_M2_HOME) @@ -1084,7 +1084,7 @@ object MavenUtil { } fun resolveM2Dir(project: Project?): Path { - val eel = if (project != null) project.getEelDescriptor().upgradeBlocking() else null + val eel = if (project != null) project.getEelDescriptor().toEelApiBlocking() else null return eel.resolveM2Dir() } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/suspendUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/suspendUtil.kt index 7f69ae658438..d83101c4f516 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/suspendUtil.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/suspendUtil.kt @@ -12,5 +12,5 @@ import java.nio.file.Path internal fun Path.getEelApiBlocking(): EelApi { @Suppress("RAW_RUN_BLOCKING") - return runBlocking { getEelDescriptor().upgrade() } + return runBlocking { getEelDescriptor().toEelApi() } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.kt index 1002f3815617..1bc7cf6cfba1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderHelper.kt @@ -202,7 +202,7 @@ open class MavenModuleBuilderHelper( private suspend fun generateFromArchetype(project: Project, pom: VirtualFile) { trigger(project, MavenActionsUsagesCollector.CREATE_MAVEN_PROJECT_FROM_ARCHETYPE) - val eel = project.getEelDescriptor().upgrade() + val eel = project.getEelDescriptor().toEelApi() val workingDir: Path = try { eel.fs.createTemporaryDirectory() diff --git a/plugins/sh/core/src/com/intellij/sh/ShDocumentationProvider.kt b/plugins/sh/core/src/com/intellij/sh/ShDocumentationProvider.kt index 5f59a633fc90..dacf391ec382 100644 --- a/plugins/sh/core/src/com/intellij/sh/ShDocumentationProvider.kt +++ b/plugins/sh/core/src/com/intellij/sh/ShDocumentationProvider.kt @@ -96,7 +96,7 @@ internal class ShDocumentationProvider(private val scope: CoroutineScope) : Docu if (commandName == null) return null val manExecutablePromise = myManExecutableCache.computeIfAbsent(eelDescriptor) { scope.suspendingLazy { - val eel = eelDescriptor.upgrade() + val eel = eelDescriptor.toEelApi() val path = eel.exec.fetchLoginShellEnvVariables()["PATH"] if (path != null) { diff --git a/plugins/sh/core/src/com/intellij/sh/formatter/ShShfmtFormatterUtil.java b/plugins/sh/core/src/com/intellij/sh/formatter/ShShfmtFormatterUtil.java index a1972ede9274..21295fb72bf1 100644 --- a/plugins/sh/core/src/com/intellij/sh/formatter/ShShfmtFormatterUtil.java +++ b/plugins/sh/core/src/com/intellij/sh/formatter/ShShfmtFormatterUtil.java @@ -39,7 +39,7 @@ import java.util.Locale; import static com.intellij.platform.eel.EelPlatformKt.*; import static com.intellij.platform.eel.provider.EelProviderUtil.getEelDescriptor; -import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking; +import static com.intellij.platform.eel.provider.EelProviderUtil.toEelApiBlocking; import static com.intellij.sh.ShBundle.message; import static com.intellij.sh.ShBundle.messagePointer; import static com.intellij.sh.ShNotification.NOTIFICATION_GROUP; @@ -72,7 +72,7 @@ public final class ShShfmtFormatterUtil { @Override public void run(@NotNull ProgressIndicator indicator) { final var eelDescriptor = getEelDescriptor(project); - final var eel = upgradeBlocking(eelDescriptor); + final var eel = toEelApiBlocking(eelDescriptor); final var eelPlatform = eel.getPlatform(); final var downloadPath = computeDownloadPath(eel); diff --git a/plugins/sh/core/src/com/intellij/sh/run/ShConfigurationType.java b/plugins/sh/core/src/com/intellij/sh/run/ShConfigurationType.java index 3e350bdab50a..8b133c07fdc1 100644 --- a/plugins/sh/core/src/com/intellij/sh/run/ShConfigurationType.java +++ b/plugins/sh/core/src/com/intellij/sh/run/ShConfigurationType.java @@ -15,7 +15,7 @@ import com.intellij.sh.ShLanguage; import org.jetbrains.annotations.NotNull; import static com.intellij.platform.eel.provider.EelProviderUtil.getEelDescriptor; -import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking; +import static com.intellij.platform.eel.provider.EelProviderUtil.toEelApiBlocking; import static com.intellij.platform.eel.provider.utils.EelPathUtils.getNioPath; import static com.intellij.platform.eel.provider.utils.EelUtilsKt.fetchLoginShellEnvVariablesBlocking; import static java.nio.file.Files.exists; @@ -63,7 +63,7 @@ public final class ShConfigurationType extends SimpleConfigurationType { } private static @NotNull String trivialDefaultShellDetection(final @NotNull EelDescriptor eelDescriptor) { - final var eel = upgradeBlocking(eelDescriptor); + final var eel = toEelApiBlocking(eelDescriptor); final var shell = fetchLoginShellEnvVariablesBlocking(eel.getExec()).get("SHELL"); if (shell != null) { diff --git a/plugins/sh/core/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java b/plugins/sh/core/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java index 8888e6e2f0a4..b1bce3757253 100644 --- a/plugins/sh/core/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java +++ b/plugins/sh/core/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java @@ -50,7 +50,7 @@ import java.util.TreeMap; import static com.intellij.platform.eel.EelPlatformKt.*; import static com.intellij.platform.eel.provider.EelProviderUtil.getEelDescriptor; -import static com.intellij.platform.eel.provider.EelProviderUtil.upgradeBlocking; +import static com.intellij.platform.eel.provider.EelProviderUtil.toEelApiBlocking; import static com.intellij.sh.ShBundle.message; import static com.intellij.sh.ShBundle.messagePointer; import static com.intellij.sh.ShNotification.NOTIFICATION_GROUP; @@ -81,7 +81,7 @@ public final class ShShellcheckUtil { @Override public void run(@NotNull ProgressIndicator indicator) { final var eelDescriptor = getEelDescriptor(project); - final var eel = upgradeBlocking(eelDescriptor); + final var eel = toEelApiBlocking(eelDescriptor); final var downloadPath = ExternalServicesUtil.computeDownloadPath(eel); diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/runner/LocalOptionsConfigurer.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/runner/LocalOptionsConfigurer.java index c18dc43e837a..2657cb98ca2c 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/runner/LocalOptionsConfigurer.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/runner/LocalOptionsConfigurer.java @@ -178,6 +178,6 @@ public final class LocalOptionsConfigurer { } private static Map fetchLoginShellEnvVariables(@NotNull EelDescriptor eelDescriptor) { - return EelUtilsKt.fetchLoginShellEnvVariablesBlocking(EelProviderUtil.upgradeBlocking(eelDescriptor).getExec()); + return EelUtilsKt.fetchLoginShellEnvVariablesBlocking(EelProviderUtil.toEelApiBlocking(eelDescriptor).getExec()); } } diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/terminalStartup.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/terminalStartup.kt index 2af3bba60069..06d8a2182f6d 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/terminalStartup.kt +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/terminalStartup.kt @@ -89,12 +89,12 @@ private suspend fun getEelApi( val wslDistribNameFromWorkingDirectory = WslPath.parseWindowsUncPath(workingDirectory.toString())?.distributionId if (wslDistribNameFromCommandline != wslDistribNameFromWorkingDirectory) { val wslRootPath = WSLDistribution(wslDistribNameFromCommandline).getUNCRootPath() - val eelApi = wslRootPath.getEelDescriptor().upgrade() + val eelApi = wslRootPath.getEelDescriptor().toEelApi() val userHome = runCatching { eelApi.exec.fetchLoginShellEnvVariables()["HOME"] }.getOrNull() return eelApi to wslRootPath.resolve(userHome ?: ".") } } - return workingDirectory.getEelDescriptor().upgrade() to workingDirectory + return workingDirectory.getEelDescriptor().toEelApi() to workingDirectory } private fun getWslDistributionNameFromCommand(command: List): String? { diff --git a/python/python-exec-service/src/com/intellij/python/community/execService/impl/ExecServiceImpl.kt b/python/python-exec-service/src/com/intellij/python/community/execService/impl/ExecServiceImpl.kt index 0d8be9f6d774..cb63930f5ae6 100644 --- a/python/python-exec-service/src/com/intellij/python/community/execService/impl/ExecServiceImpl.kt +++ b/python/python-exec-service/src/com/intellij/python/community/execService/impl/ExecServiceImpl.kt @@ -91,7 +91,7 @@ private suspend fun WhatToExec.buildExecutableProcess(args: List, option val (exe, args) = when (this) { is WhatToExec.Binary -> Pair(binary, args) is WhatToExec.Helper -> { - val eel = python.getEelDescriptor().upgrade() + val eel = python.getEelDescriptor().toEelApi() val localHelper = PythonHelpersLocator.findPathInHelpers(helper) ?: error("No ${helper} found: installation broken?") val remoteHelper = EelPathUtils.transferLocalContentToRemote( @@ -114,7 +114,7 @@ private suspend fun WhatToExec.buildExecutableProcess(args: List, option private suspend fun EelExecutableProcess.run(): PyExecResult { val workingDirectory = if (workingDirectory != null && !workingDirectory.isAbsolute) workingDirectory.toRealPath() else workingDirectory try { - val executionResult = exe.descriptor.upgrade().exec.spawnProcess(exe.toString()) + val executionResult = exe.descriptor.toEelApi().exec.spawnProcess(exe.toString()) .args(args) .env(env) .workingDirectory(workingDirectory?.asEelPath()).eelIt() diff --git a/python/python-hatch/src/com/intellij/python/hatch/service/CliBasedHatchService.kt b/python/python-hatch/src/com/intellij/python/hatch/service/CliBasedHatchService.kt index 7d79f86caf67..d2a63f991f9e 100644 --- a/python/python-hatch/src/com/intellij/python/hatch/service/CliBasedHatchService.kt +++ b/python/python-hatch/src/com/intellij/python/hatch/service/CliBasedHatchService.kt @@ -94,7 +94,7 @@ internal class CliBasedHatchService private constructor( override suspend fun createNewProject(projectName: String): PyResult { - val eelApi = workingDirectoryPath.getEelDescriptor().upgrade() + val eelApi = workingDirectoryPath.getEelDescriptor().toEelApi() val tempDir = eelApi.fs.createTemporaryDirectory(EelFileSystemApi.CreateTemporaryEntryOptions.Builder().build()).getOr { failure -> return Result.failure(FileSystemOperationHatchError(failure.error)) } diff --git a/python/services/internal-impl/src/com/intellij/python/community/services/internal/impl/PythonWithLanguageLevelImpl.kt b/python/services/internal-impl/src/com/intellij/python/community/services/internal/impl/PythonWithLanguageLevelImpl.kt index 1e05de148aa6..320a0dbff3fd 100644 --- a/python/services/internal-impl/src/com/intellij/python/community/services/internal/impl/PythonWithLanguageLevelImpl.kt +++ b/python/services/internal-impl/src/com/intellij/python/community/services/internal/impl/PythonWithLanguageLevelImpl.kt @@ -69,7 +69,7 @@ class PythonWithLanguageLevelImpl internal constructor( } override suspend fun getReadableName(): @Nls String { - val eelApi = pythonBinary.getEelDescriptor().upgrade() + val eelApi = pythonBinary.getEelDescriptor().toEelApi() val home = eelApi.userInfo.home.asNioPath() val separator = when (eelApi.platform) { is EelPlatform.Windows -> "\\" diff --git a/python/services/system-python/src/com/intellij/python/community/services/systemPython/impl/SystemPythonInitialLoader.kt b/python/services/system-python/src/com/intellij/python/community/services/systemPython/impl/SystemPythonInitialLoader.kt index 183abe5be0ee..4f9debaeaed6 100644 --- a/python/services/system-python/src/com/intellij/python/community/services/systemPython/impl/SystemPythonInitialLoader.kt +++ b/python/services/system-python/src/com/intellij/python/community/services/systemPython/impl/SystemPythonInitialLoader.kt @@ -15,6 +15,6 @@ internal class SystemPythonInitialLoader : ProjectActivity { override suspend fun execute(project: Project) { if (getCacheTimeout() == null) return // Cache is disabled, no need to preload it logger.debug("Preloading pythons for $project") - SystemPythonService().findSystemPythons(project.getEelDescriptor().upgrade()) + SystemPythonService().findSystemPythons(project.getEelDescriptor().toEelApi()) } } \ No newline at end of file diff --git a/python/services/system-python/src/com/intellij/python/community/services/systemPython/systemPythonServiceImpl.kt b/python/services/system-python/src/com/intellij/python/community/services/systemPython/systemPythonServiceImpl.kt index e5e20c440bc0..77a7b205d335 100644 --- a/python/services/system-python/src/com/intellij/python/community/services/systemPython/systemPythonServiceImpl.kt +++ b/python/services/system-python/src/com/intellij/python/community/services/systemPython/systemPythonServiceImpl.kt @@ -53,7 +53,7 @@ internal class SystemPythonServiceImpl(scope: CoroutineScope) : SystemPythonServ scope.launch { _cacheImpl.complete(getCacheTimeout()?.let { interval -> Cache(scope, interval) { eelDescriptor -> - searchPythonsPhysicallyNoCache(eelDescriptor.upgrade()) + searchPythonsPhysicallyNoCache(eelDescriptor.toEelApi()) } }) } diff --git a/python/services/system-python/tests/com/intellij/python/junit5Tests/env/systemPython/SystemPythonServiceShowCaseTest.kt b/python/services/system-python/tests/com/intellij/python/junit5Tests/env/systemPython/SystemPythonServiceShowCaseTest.kt index 473930da05d3..9fccb9e7cceb 100644 --- a/python/services/system-python/tests/com/intellij/python/junit5Tests/env/systemPython/SystemPythonServiceShowCaseTest.kt +++ b/python/services/system-python/tests/com/intellij/python/junit5Tests/env/systemPython/SystemPythonServiceShowCaseTest.kt @@ -47,7 +47,7 @@ class SystemPythonServiceShowCaseTest { fun testListPythons(): Unit = timeoutRunBlocking(10.minutes) { for (systemPython in SystemPythonService().findSystemPythons(forceRefresh = true)) { fileLogger().info("Python found: $systemPython") - val eelApi = systemPython.pythonBinary.getEelDescriptor().upgrade() + val eelApi = systemPython.pythonBinary.getEelDescriptor().toEelApi() val process = eelApi.exec.spawnProcess(systemPython.pythonBinary.pathString, "--version").eelIt() val output = async { (if (systemPython.languageLevel.isPy3K) process.stdout else process.stderr).readWholeText()