From 790d3d01cdd2b8b565205fb0132b313e61b2d30d Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Fri, 18 Jul 2025 07:49:00 +0400 Subject: [PATCH] IJPL-184662 Moved inject/uninject actions to the backend for now GitOrigin-RevId: cf483405b32ba89512f1fd115cb8db3182e672e8 --- plugins/IntelliLang/backend/BUILD.bazel | 18 ++++++++++++++++++ ...intellij.platform.langInjection.backend.iml | 9 ++++++--- ...intellij.platform.langInjection.backend.xml | 12 ++++++++++++ .../InjectLanguageAction/after.txt.template | 0 .../InjectLanguageAction/before.txt.template | 0 .../InjectLanguageAction/description.html | 0 .../UnInjectLanguageAction/after.txt.template | 0 .../UnInjectLanguageAction/before.txt.template | 0 .../UnInjectLanguageAction/description.html | 0 .../inject/InjectLanguageAction.java | 0 .../inject/UnInjectLanguageAction.java | 2 +- .../intellij.platform.langInjection.xml | 12 ------------ 12 files changed, 37 insertions(+), 16 deletions(-) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/InjectLanguageAction/after.txt.template (100%) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/InjectLanguageAction/before.txt.template (100%) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/InjectLanguageAction/description.html (100%) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/UnInjectLanguageAction/after.txt.template (100%) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/UnInjectLanguageAction/before.txt.template (100%) rename plugins/IntelliLang/{ => backend}/resources/intentionDescriptions/UnInjectLanguageAction/description.html (100%) rename plugins/IntelliLang/{ => backend}/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java (100%) rename plugins/IntelliLang/{ => backend}/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java (98%) diff --git a/plugins/IntelliLang/backend/BUILD.bazel b/plugins/IntelliLang/backend/BUILD.bazel index cb94531853b1..1266a840b109 100644 --- a/plugins/IntelliLang/backend/BUILD.bazel +++ b/plugins/IntelliLang/backend/BUILD.bazel @@ -47,6 +47,21 @@ jvm_provided_library( lib = "//platform/projectModel-api:projectModel" ) +jvm_provided_library( + name = "ide_provided", + lib = "//platform/platform-api:ide" +) + +jvm_provided_library( + name = "editor-ui_provided", + lib = "//platform/editor-ui-api:editor-ui" +) + +jvm_provided_library( + name = "core-ui_provided", + lib = "//platform/core-ui" +) + jvm_library( name = "backend", module_name = "intellij.platform.langInjection.backend", @@ -62,6 +77,9 @@ jvm_library( ":langInjection_provided", ":util-ui_provided", ":projectModel_provided", + ":ide_provided", + ":editor-ui_provided", + ":core-ui_provided", ], runtime_deps = [":backend_resources"] ) diff --git a/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml b/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml index b48aac1e5b1e..5661a57a18cb 100644 --- a/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml +++ b/plugins/IntelliLang/backend/intellij.platform.langInjection.backend.iml @@ -2,9 +2,9 @@ - - - + + + @@ -17,5 +17,8 @@ + + + \ No newline at end of file diff --git a/plugins/IntelliLang/backend/resources/intellij.platform.langInjection.backend.xml b/plugins/IntelliLang/backend/resources/intellij.platform.langInjection.backend.xml index b081c22901de..276cd3976cb6 100644 --- a/plugins/IntelliLang/backend/resources/intellij.platform.langInjection.backend.xml +++ b/plugins/IntelliLang/backend/resources/intellij.platform.langInjection.backend.xml @@ -18,5 +18,17 @@ groupBundle="messages.InspectionsBundle" groupKey="inspection.general.tools.group.name" key="inspection.injected.references.display.name" bundle="messages.IntelliLangBundle"/> + + org.intellij.plugins.intelliLang.inject.InjectLanguageAction + messages.LangBundle + intention.category.language.injection + + + + org.intellij.plugins.intelliLang.inject.UnInjectLanguageAction + messages.LangBundle + intention.category.language.injection + + diff --git a/plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/after.txt.template b/plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/after.txt.template similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/after.txt.template rename to plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/after.txt.template diff --git a/plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/before.txt.template b/plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/before.txt.template similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/before.txt.template rename to plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/before.txt.template diff --git a/plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/description.html b/plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/description.html similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/InjectLanguageAction/description.html rename to plugins/IntelliLang/backend/resources/intentionDescriptions/InjectLanguageAction/description.html diff --git a/plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/after.txt.template b/plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/after.txt.template similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/after.txt.template rename to plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/after.txt.template diff --git a/plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/before.txt.template b/plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/before.txt.template similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/before.txt.template rename to plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/before.txt.template diff --git a/plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/description.html b/plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/description.html similarity index 100% rename from plugins/IntelliLang/resources/intentionDescriptions/UnInjectLanguageAction/description.html rename to plugins/IntelliLang/backend/resources/intentionDescriptions/UnInjectLanguageAction/description.html diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java b/plugins/IntelliLang/backend/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java similarity index 100% rename from plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java rename to plugins/IntelliLang/backend/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java b/plugins/IntelliLang/backend/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java similarity index 98% rename from plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java rename to plugins/IntelliLang/backend/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java index 3883f05d2739..7f125d778e46 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java +++ b/plugins/IntelliLang/backend/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.intellij.plugins.intelliLang.inject; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml index a2e5e84c2c90..1fd91176abe8 100644 --- a/plugins/IntelliLang/resources/intellij.platform.langInjection.xml +++ b/plugins/IntelliLang/resources/intellij.platform.langInjection.xml @@ -11,18 +11,6 @@ - - org.intellij.plugins.intelliLang.inject.InjectLanguageAction - messages.LangBundle - intention.category.language.injection - - - - org.intellij.plugins.intelliLang.inject.UnInjectLanguageAction - messages.LangBundle - intention.category.language.injection - - org.intellij.plugins.intelliLang.inject.EditInjectionSettingsAction messages.LangBundle