From 8dc3fffd0e270edd3d0f3b24db0dca4aa691a08f Mon Sep 17 00:00:00 2001 From: Louis Vignier Date: Mon, 7 Jul 2025 19:30:41 +0900 Subject: [PATCH] [jdk] Remove ParseSdkmanrcAction Instead of an action that only works for `.sdkmanrc`, we should provide an inlay for all recognized external Java configuration files. #IDEA-364749 GitOrigin-RevId: 69fa8917576d5a52304a5ddb07fe14541ab32749 --- .../messages/JavaUiBundle.properties | 1 - .../resources/META-INF/JavaPlugin.xml | 4 -- .../projectRoots/impl/ParseSdkmanrcAction.kt | 38 ------------------- 3 files changed, 43 deletions(-) delete mode 100644 java/java-impl/src/com/intellij/openapi/projectRoots/impl/ParseSdkmanrcAction.kt diff --git a/java/idea-ui/resources/messages/JavaUiBundle.properties b/java/idea-ui/resources/messages/JavaUiBundle.properties index 6738ca7da381..43f359969fd1 100644 --- a/java/idea-ui/resources/messages/JavaUiBundle.properties +++ b/java/idea-ui/resources/messages/JavaUiBundle.properties @@ -713,7 +713,6 @@ action.DisableRepositoryLibrariesSha256Checksum.text=Disable SHA256 Checksum for action.UnbindRemoteRepositoryForAllRepositoryLibraries.text=Unbind Remote Repositories for All Libraries action.GuessRemoteRepositoryForEachRepositoryLibrary.text=Guess and Bind Remote Repositories for All Libraries action.ResolveAllRepositoryLibraries.text=Resolve All Maven Libraries -action.ParseSdkmanrcAction.text=Update Project JDK action.DownloadJdkAction.text=Download JDK\u2026 action.AddJdkAction.text=Add JDK from Disk\u2026 diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml index b3c1684cc699..97b044542650 100644 --- a/java/java-impl/resources/META-INF/JavaPlugin.xml +++ b/java/java-impl/resources/META-INF/JavaPlugin.xml @@ -2823,10 +2823,6 @@ - - - - diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ParseSdkmanrcAction.kt b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ParseSdkmanrcAction.kt deleted file mode 100644 index 85de67d09c36..000000000000 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/ParseSdkmanrcAction.kt +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.openapi.projectRoots.impl - -import com.intellij.openapi.actionSystem.ActionUpdateThread -import com.intellij.openapi.actionSystem.AnAction -import com.intellij.openapi.actionSystem.AnActionEvent -import com.intellij.openapi.actionSystem.CommonDataKeys -import com.intellij.openapi.components.service -import com.intellij.openapi.vfs.VirtualFile - -internal class ParseSdkmanrcAction: AnAction() { - override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT - - override fun update(e: AnActionEvent) { - val project = e.project - if (project == null) { - e.presentation.isEnabledAndVisible = false - return - } - - val sdkmanrcConfigProvider = ExternalJavaConfigurationProvider.EP_NAME.extensionList.find { it is SdkmanrcConfigurationProvider } - - if (sdkmanrcConfigProvider == null) { - e.presentation.isEnabledAndVisible = false - return - } - - val file: VirtualFile? = CommonDataKeys.VIRTUAL_FILE.getData(e.dataContext) - - e.presentation.isEnabledAndVisible = file != null && file.path == sdkmanrcConfigProvider.getConfigurationFile(project).absolutePath - } - - override fun actionPerformed(e: AnActionEvent) { - val project = e.project ?: return - val sdkmanrcConfigProvider = ExternalJavaConfigurationProvider.EP_NAME.extensionList.find { it is SdkmanrcConfigurationProvider } ?: return - project.service().updateJdkFromConfig(sdkmanrcConfigProvider) - } -} \ No newline at end of file