diff --git a/.idea/modules.xml b/.idea/modules.xml
index ff356d644e91..30e7cb9fd59f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -475,7 +475,6 @@
-
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 10afd97f3deb..0797b96b0e8c 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -949,7 +949,6 @@ plugins/grazie/src/test
plugins/grazie/xml
plugins/grazie/yaml
plugins/groovy
-plugins/groovy-live-templates
plugins/groovy/git
plugins/groovy/groovy-psi
plugins/groovy/groovy-uast-tests
diff --git a/platform/lang-api/resources/messages/CodeInsightBundle.properties b/platform/lang-api/resources/messages/CodeInsightBundle.properties
index b0ab75d0dc54..564dff7554da 100644
--- a/platform/lang-api/resources/messages/CodeInsightBundle.properties
+++ b/platform/lang-api/resources/messages/CodeInsightBundle.properties
@@ -181,6 +181,7 @@ macro.spacesToUnderscores.string=spacesToUnderscores(String)
macro.underscoresToCamelCase.string=underscoresToCamelCase(String)
macro.capitalizeAndUnderscore.string=capitalizeAndUnderscore(String)
macro.enum=enum(...)
+macro.groovy.script=groovyScript("groovy code")
livetemplate.description.surround.tag=Surround with
livetemplate.description.surround.cdata.in.xmlorhtmlorjsp=Surround with CDATA section
disable.intention.action=Disable ''{0}''
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index d924867c0173..f69b2ba2e11e 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -59,6 +59,7 @@ jvm_library(
"//libraries/commons/logging",
"//platform/diff-impl",
"//platform/built-in-server-api:builtInServer",
+ "@lib//:org-codehaus-groovy-groovy",
"//libraries/xstream",
"//libraries/miglayout-swing",
"//platform/ide-core/plugins",
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index e6611c9842dc..65296d76c6fc 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -67,6 +67,7 @@
+
diff --git a/plugins/groovy-live-templates/src/GroovyScriptMacro.java b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
similarity index 94%
rename from plugins/groovy-live-templates/src/GroovyScriptMacro.java
rename to platform/lang-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
index f047d5513c7e..7a0f6e346020 100644
--- a/plugins/groovy-live-templates/src/GroovyScriptMacro.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java
@@ -1,6 +1,7 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.groovy.live.templates;
+// 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.codeInsight.template.macro;
+import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.codeInsight.template.*;
@@ -34,7 +35,7 @@ public final class GroovyScriptMacro extends Macro {
@Override
public String getPresentableName() {
- return GroovyLiveTemplatesBundle.message("macro.groovy.script");
+ return CodeInsightBundle.message("macro.groovy.script");
}
@Override
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 07cdd2b11a45..8944ceecb225 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -586,6 +586,7 @@
+
diff --git a/plugins/groovy-live-templates/BUILD.bazel b/plugins/groovy-live-templates/BUILD.bazel
deleted file mode 100644
index 0339311fd9fb..000000000000
--- a/plugins/groovy-live-templates/BUILD.bazel
+++ /dev/null
@@ -1,27 +0,0 @@
-### auto-generated section `build intellij.groovy.live.templates` start
-load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
-
-resourcegroup(
- name = "groovy-live-templates_resources",
- srcs = glob(["resources/**/*"]),
- strip_prefix = "resources"
-)
-
-jvm_library(
- name = "groovy-live-templates",
- module_name = "intellij.groovy.live.templates",
- visibility = ["//visibility:public"],
- srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
- resources = [":groovy-live-templates_resources"],
- deps = [
- "@lib//:jetbrains-annotations",
- "@lib//:kotlin-stdlib",
- "@lib//:org-codehaus-groovy-groovy",
- "//platform/analysis-api:analysis",
- "//platform/core-api:core",
- "//platform/editor-ui-api:editor-ui",
- "//platform/lang-impl",
- "//platform/util",
- ]
-)
-### auto-generated section `build intellij.groovy.live.templates` end
\ No newline at end of file
diff --git a/plugins/groovy-live-templates/intellij.groovy.live.templates.iml b/plugins/groovy-live-templates/intellij.groovy.live.templates.iml
deleted file mode 100644
index 464fe9918268..000000000000
--- a/plugins/groovy-live-templates/intellij.groovy.live.templates.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/plugins/groovy-live-templates/plugin-content.yaml b/plugins/groovy-live-templates/plugin-content.yaml
deleted file mode 100644
index d9b4bcecf86a..000000000000
--- a/plugins/groovy-live-templates/plugin-content.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- name: lib/groovy-live-templates.jar
- modules:
- - name: intellij.groovy.live.templates
\ No newline at end of file
diff --git a/plugins/groovy-live-templates/resources/META-INF/plugin.xml b/plugins/groovy-live-templates/resources/META-INF/plugin.xml
deleted file mode 100644
index f5fdcfdca5ba..000000000000
--- a/plugins/groovy-live-templates/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- org.intellij.groovy.live.templates
- Groovy Live Templates Support
-
- JetBrains
-
- com.intellij.modules.platform
-
-
-
-
-
diff --git a/plugins/groovy-live-templates/resources/META-INF/pluginIcon.svg b/plugins/groovy-live-templates/resources/META-INF/pluginIcon.svg
deleted file mode 100644
index f31f8cd69c04..000000000000
--- a/plugins/groovy-live-templates/resources/META-INF/pluginIcon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/plugins/groovy-live-templates/resources/messages/GroovyLiveTemplates.properties b/plugins/groovy-live-templates/resources/messages/GroovyLiveTemplates.properties
deleted file mode 100644
index 2b8b99c10e18..000000000000
--- a/plugins/groovy-live-templates/resources/messages/GroovyLiveTemplates.properties
+++ /dev/null
@@ -1 +0,0 @@
-macro.groovy.script=groovyScript("groovy code")
\ No newline at end of file
diff --git a/plugins/groovy-live-templates/src/GroovyLiveTemplatesBundle.java b/plugins/groovy-live-templates/src/GroovyLiveTemplatesBundle.java
deleted file mode 100644
index 852bf0503702..000000000000
--- a/plugins/groovy-live-templates/src/GroovyLiveTemplatesBundle.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.groovy.live.templates;
-
-
-import com.intellij.DynamicBundle;
-import com.intellij.ide.IdeDeprecatedMessagesBundle;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.PropertyKey;
-
-import java.util.function.Supplier;
-
-public final class GroovyLiveTemplatesBundle{
- public static final @NonNls String BUNDLE = "messages.GroovyLiveTemplates";
-
- private static final DynamicBundle INSTANCE = new DynamicBundle(GroovyLiveTemplatesBundle.class, BUNDLE);
-
- private GroovyLiveTemplatesBundle() {}
-
- public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
- if (INSTANCE.containsKey(key)) {
- return INSTANCE.getMessage(key, params);
- }
- return IdeDeprecatedMessagesBundle.message(key, params);
- }
-
- public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
- if (INSTANCE.containsKey(key)) {
- return INSTANCE.getLazyMessage(key, params);
- }
- return IdeDeprecatedMessagesBundle.messagePointer(key, params);
- }
-}
\ No newline at end of file