From ea351a0e8fb6f41540e5e3cbea49058d325cc02e Mon Sep 17 00:00:00 2001 From: "Victoria.Petrakovich" Date: Mon, 27 Mar 2023 10:53:38 +0200 Subject: [PATCH] [kotlin] IDE. Configuration: Remove option to configure Kotlin with JS from Tools -> Kotlin menu ^KTIJ-24543 Fixed GitOrigin-RevId: beebd2a4dbe72859b2c4f40810b01d34432fe96b --- build/tasks/resources/linux/class-report.txt | 1 - build/tasks/resources/mac/class-report.txt | 1 - build/tasks/resources/windows/class-report.txt | 1 - .../resources-en/messages/KotlinBundle.properties | 1 - .../kotlin/jvm/resources/META-INF/jvm-common.xml | 4 ---- .../actions/ConfigureKotlinInProjectAction.kt | 15 --------------- .../resources/search/searchableOptions.xml | 5 ----- 7 files changed, 28 deletions(-) diff --git a/build/tasks/resources/linux/class-report.txt b/build/tasks/resources/linux/class-report.txt index d22f822c1426..b93c7335eeee 100644 --- a/build/tasks/resources/linux/class-report.txt +++ b/build/tasks/resources/linux/class-report.txt @@ -10211,7 +10211,6 @@ org/jetbrains/kotlin/idea/migration/CodeMigrationToggleAction.class:plugins/Kotl org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinJavaInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar -org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/DecompileKotlinToJavaAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/KotlinJvmDecompilerBundle.class:plugins/Kotlin/lib/kotlin-plugin.jar diff --git a/build/tasks/resources/mac/class-report.txt b/build/tasks/resources/mac/class-report.txt index d22f822c1426..b93c7335eeee 100644 --- a/build/tasks/resources/mac/class-report.txt +++ b/build/tasks/resources/mac/class-report.txt @@ -10211,7 +10211,6 @@ org/jetbrains/kotlin/idea/migration/CodeMigrationToggleAction.class:plugins/Kotl org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinJavaInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar -org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/DecompileKotlinToJavaAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/KotlinJvmDecompilerBundle.class:plugins/Kotlin/lib/kotlin-plugin.jar diff --git a/build/tasks/resources/windows/class-report.txt b/build/tasks/resources/windows/class-report.txt index d22f822c1426..b93c7335eeee 100644 --- a/build/tasks/resources/windows/class-report.txt +++ b/build/tasks/resources/windows/class-report.txt @@ -10211,7 +10211,6 @@ org/jetbrains/kotlin/idea/migration/CodeMigrationToggleAction.class:plugins/Kotl org/jetbrains/kotlin/console/actions/RunKotlinConsoleAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ConfigureKotlinJavaInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar -org/jetbrains/kotlin/idea/actions/ConfigureKotlinJsInProjectAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/actions/ShowKotlinBytecodeAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/DecompileKotlinToJavaAction.class:plugins/Kotlin/lib/kotlin-plugin.jar org/jetbrains/kotlin/idea/jvmDecompiler/KotlinJvmDecompilerBundle.class:plugins/Kotlin/lib/kotlin-plugin.jar diff --git a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties b/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties index ae90e90707ec..45b6c3d7dbe7 100644 --- a/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties +++ b/plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties @@ -2035,7 +2035,6 @@ action.Kotlin.XDebugger.ToggleKotlinVariableView.text=Show Kotlin Variables Only action.InspectBreakpointApplicability.text=Inspect Breakpoint Applicability action.Kotlin.XDebugger.CoroutinesDump.text=Get Coroutines Dump action.ShowKotlinBytecode.text=Show Kotlin Bytecode -action.ConfigureKotlinJsInProject.text=Configure Kotlin (JavaScript) in Project action.ConfigureKotlinInProject.text=Configure Kotlin in Project action.KotlinConsoleREPL.text=Kotlin REPL (Experimental) action.LibraryToSourceDependencySupportToggleAction.text=Toggle library to source dependency support diff --git a/plugins/kotlin/jvm/resources/META-INF/jvm-common.xml b/plugins/kotlin/jvm/resources/META-INF/jvm-common.xml index 2c79796192a3..5e13bc032411 100644 --- a/plugins/kotlin/jvm/resources/META-INF/jvm-common.xml +++ b/plugins/kotlin/jvm/resources/META-INF/jvm-common.xml @@ -10,10 +10,6 @@ - - - - diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt index b1cdae9f8a60..15fd65a955ba 100644 --- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt +++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt @@ -52,21 +52,6 @@ abstract class ConfigureKotlinInProjectAction : AnAction() { } } - -class ConfigureKotlinJsInProjectAction : ConfigureKotlinInProjectAction() { - override fun getApplicableConfigurators(project: Project) = getAbleToRunConfigurators(project).filter { - it.targetPlatform.isJs() - } - - override fun getActionUpdateThread() = ActionUpdateThread.BGT - - override fun update(e: AnActionEvent) { - val project = e.project - e.presentation.isEnabledAndVisible = PlatformUtils.isIntelliJ() - || !(project == null || project.modules.asList().all { it.buildSystemType != BuildSystemType.JPS }) - } -} - class ConfigureKotlinJavaInProjectAction : ConfigureKotlinInProjectAction() { override fun getApplicableConfigurators(project: Project) = getAbleToRunConfigurators(project).filter { it.targetPlatform.isJvm() diff --git a/resources-en/resources/search/searchableOptions.xml b/resources-en/resources/search/searchableOptions.xml index bd04274df091..3aca70e6cb83 100644 --- a/resources-en/resources/search/searchableOptions.xml +++ b/resources-en/resources/search/searchableOptions.xml @@ -2541,11 +2541,6 @@