From eb5579239858e4123c23d9be41c2693688639d5d Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Wed, 8 May 2024 18:01:22 +0800 Subject: [PATCH] feat(exts-git): extract and rename git plugin support #183 This commit extracts the git plugin support and renames the refactoring implementation, including changes to the package, resource-bundle, and plugin.xml. It also adds a new file cc.unitmesh.git.xml and modifies the build.gradle.kts file to include the Git4Idea plugin. --- build.gradle.kts | 7 ++--- .../git}/actions/vcs/CodeReviewAction.kt | 2 +- .../git}/actions/vcs/PrepushReviewAction.kt | 2 +- .../src/main/resources/cc.unitmesh.git.xml | 27 +++++++++++++++++++ plugin/src/main/resources/META-INF/plugin.xml | 1 + .../main/resources/META-INF/autodev-core.xml | 21 --------------- .../main/resources/META-INF/autodev-core.xml | 21 --------------- 7 files changed, 34 insertions(+), 47 deletions(-) rename {src/main/kotlin/cc/unitmesh/devti => exts/ext-git/src/main/kotlin/cc/unitmesh/git}/actions/vcs/CodeReviewAction.kt (98%) rename {src/main/kotlin/cc/unitmesh/devti => exts/ext-git/src/main/kotlin/cc/unitmesh/git}/actions/vcs/PrepushReviewAction.kt (97%) create mode 100644 exts/ext-git/src/main/resources/cc.unitmesh.git.xml diff --git a/build.gradle.kts b/build.gradle.kts index a6891ebb88..45df49c610 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -93,7 +93,6 @@ val scalaPlugin = prop("scalaPlugin") val pluginProjects: List get() = rootProject.allprojects.toList() val ideaPlugins = listOf( - "Git4Idea", // "org.jetbrains.plugins.terminal", "com.intellij.java", "org.jetbrains.plugins.gradle", @@ -415,7 +414,6 @@ project(":") { implementation(libs.kotlinx.serialization.json) implementation("cc.unitmesh:cocoa-core:0.4.5") - implementation("cc.unitmesh:git-commit-message:0.4.5") // kanban implementation(libs.github.api) @@ -601,10 +599,12 @@ project(":exts:ext-harmonyos") { project(":exts:ext-git") { intellij { version.set(ideaVersion) + plugins.set(ideaPlugins + "Git4Idea") } dependencies { implementation(project(":")) + implementation("cc.unitmesh:git-commit-message:0.4.5") } } @@ -645,11 +645,12 @@ project(":exts:devins-lang") { intellij { version.set(ideaVersion) - plugins.set((ideaPlugins + "org.intellij.plugins.markdown" + "com.jetbrains.sh")) + plugins.set((ideaPlugins + "org.intellij.plugins.markdown" + "com.jetbrains.sh" + "Git4Idea")) } dependencies { implementation(project(":")) + implementation(project(":exts:ext-git")) } tasks { diff --git a/src/main/kotlin/cc/unitmesh/devti/actions/vcs/CodeReviewAction.kt b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CodeReviewAction.kt similarity index 98% rename from src/main/kotlin/cc/unitmesh/devti/actions/vcs/CodeReviewAction.kt rename to exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CodeReviewAction.kt index dbe0e50c05..5fa6059c97 100644 --- a/src/main/kotlin/cc/unitmesh/devti/actions/vcs/CodeReviewAction.kt +++ b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/CodeReviewAction.kt @@ -1,4 +1,4 @@ -package cc.unitmesh.devti.actions.vcs +package cc.unitmesh.git.actions.vcs import cc.unitmesh.devti.AutoDevBundle import cc.unitmesh.devti.AutoDevNotifications diff --git a/src/main/kotlin/cc/unitmesh/devti/actions/vcs/PrepushReviewAction.kt b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/PrepushReviewAction.kt similarity index 97% rename from src/main/kotlin/cc/unitmesh/devti/actions/vcs/PrepushReviewAction.kt rename to exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/PrepushReviewAction.kt index 8e2ae9a8c8..cbf884fe2c 100644 --- a/src/main/kotlin/cc/unitmesh/devti/actions/vcs/PrepushReviewAction.kt +++ b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/actions/vcs/PrepushReviewAction.kt @@ -1,4 +1,4 @@ -package cc.unitmesh.devti.actions.vcs +package cc.unitmesh.git.actions.vcs import cc.unitmesh.devti.AutoDevBundle import cc.unitmesh.devti.vcs.VcsPrompting diff --git a/exts/ext-git/src/main/resources/cc.unitmesh.git.xml b/exts/ext-git/src/main/resources/cc.unitmesh.git.xml new file mode 100644 index 0000000000..0ee41421af --- /dev/null +++ b/exts/ext-git/src/main/resources/cc.unitmesh.git.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml index cd761a5bf0..1d0423f5ba 100644 --- a/plugin/src/main/resources/META-INF/plugin.xml +++ b/plugin/src/main/resources/META-INF/plugin.xml @@ -37,6 +37,7 @@ + diff --git a/src/222/main/resources/META-INF/autodev-core.xml b/src/222/main/resources/META-INF/autodev-core.xml index c948f07ebf..5955ed87b9 100644 --- a/src/222/main/resources/META-INF/autodev-core.xml +++ b/src/222/main/resources/META-INF/autodev-core.xml @@ -2,7 +2,6 @@ messages.AutoDevBundle com.intellij.modules.platform - Git4Idea - - - - - - - - - - - - - diff --git a/src/233/main/resources/META-INF/autodev-core.xml b/src/233/main/resources/META-INF/autodev-core.xml index e60ec8c718..8964763a07 100644 --- a/src/233/main/resources/META-INF/autodev-core.xml +++ b/src/233/main/resources/META-INF/autodev-core.xml @@ -2,7 +2,6 @@ messages.AutoDevBundle com.intellij.modules.platform - Git4Idea - - - - - - - - - - - - -