().launchRebase(repository, commitsToWarnAbout.first())
- }
-
- return result == DialogWrapper.OK_EXIT_CODE
- }
-}
-
-private class CommitValidationDialog(
- project: Project,
- private val commitsInfo: String
-) : DialogWrapper(project) {
-
- companion object {
- const val EDIT_EXIT_CODE = NEXT_USER_EXIT_CODE + 1
- }
-
- private val editAction = object : DialogWrapperAction(DevKitGitBundle.message("push.commit.message.lacks.issue.reference.edit")) {
- override fun doAction(e: java.awt.event.ActionEvent) {
- close(EDIT_EXIT_CODE)
- }
- }
-
- private val commitAction = object : DialogWrapperAction(DevKitGitBundle.message("push.commit.message.lacks.issue.reference.commit")) {
- override fun doAction(e: java.awt.event.ActionEvent) {
- close(OK_EXIT_CODE)
- }
- }
-
- init {
- title = DevKitGitBundle.message("push.commit.intellij.platform.handler.title")
- isResizable = true
- init()
- rootPane.defaultButton = getButton(editAction)
- }
-
- override fun createCenterPanel(): JComponent {
- val panel = JPanel(BorderLayout())
- val explanationPane = JEditorPane("text/html", DevKitGitBundle.message("push.commit.intellij.platform.message.lacks.issue.reference.body", commitsInfo)).apply {
- isEditable = false
- background = panel.background
- putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, true)
- border = null
- }
- @Suppress("HardCodedStringLiteral")
- val commitInfoPane = JEditorPane("text/html", "${commitsInfo.replace("\n", "
")}").apply {
- isEditable = false
- background = panel.background
- }
- val scrollPane = JBScrollPane(commitInfoPane).apply {
- minimumSize = Dimension(400, 150)
- preferredSize = Dimension(600, 300)
- verticalScrollBarPolicy = JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED
- horizontalScrollBarPolicy = JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED
- border = null
- }
- panel.add(explanationPane, BorderLayout.NORTH)
- panel.add(scrollPane, BorderLayout.CENTER)
- return panel
- }
-
- override fun createActions(): Array {
- return arrayOf(
- commitAction,
- editAction,
- cancelAction
- )
- }
-
- override fun getDimensionServiceKey(): String {
- return "IntelliJPlatformCommitValidationDialog"
- }
-}
\ No newline at end of file
diff --git a/plugins/devkit/intellij.devkit.git/src/kotlinPrePushHandlers.kt b/plugins/devkit/intellij.devkit.git/src/kotlinPrePushHandlers.kt
deleted file mode 100644
index 45e2ae575b16..000000000000
--- a/plugins/devkit/intellij.devkit.git/src/kotlinPrePushHandlers.kt
+++ /dev/null
@@ -1,76 +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 org.jetbrains.idea.devkit.commit
-
-import com.intellij.dvcs.push.PushInfo
-import com.intellij.openapi.progress.ProgressIndicator
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.MessageDialogBuilder
-import com.intellij.openapi.util.registry.Registry
-import org.jetbrains.annotations.Nls
-import java.nio.file.Path
-
-internal class KotlinNotebookPluginPrePushHandler : IssueIDPrePushHandler() {
- override val paths: List = listOf("plugins/kotlin/jupyter/")
- override val acceptableProjects: List = super.acceptableProjects + listOf(
- "PY"
- )
- override val commitMessageRegex = buildRegexFromAcceptableProjects()
-
- override fun isAvailable(): Boolean = Registry.`is`("kotlin.notebook.commit.message.validation.enabled", true)
- override fun getPresentableName(): String = DevKitGitBundle.message("push.commit.kotlin.notebook.handler.name")
-}
-
-
-private val KOTLIN_BUILD_TOOLS_PATHS_TO_IGNORE: List =
- listOf("community/plugins/kotlin/gradle/gradle-java/k1/test/org/jetbrains/kotlin/idea/scripting/")
-
-// To be in sync with https://jetbrains.team/p/ij/repositories/ultimate-teamcity-config/files/master/.teamcity/src/idea/cherryPickRobot/branchReviewRules/BranchReviewRules.kt
-// see approval(ReviewerGroups.kotlinBuildToolsTeam)
-private val KOTLIN_BUILD_TOOLS_PATHS: List =
- listOf(
- "community/plugins/kotlin/base/facet/",
- "community/plugins/kotlin/base/jps/",
- "community/plugins/kotlin/base/external-build-system/",
- "community/plugins/kotlin/gradle/gradle/",
- "community/plugins/kotlin/gradle/gradle-tooling/",
- "community/plugins/kotlin/gradle/gradle-java/",
- "community/plugins/kotlin/gradle/multiplatform-tests/",
- "community/plugins/kotlin/gradle/multiplatform-tests-k2/",
- "community/plugins/kotlin/jps/",
- "community/plugins/kotlin/maven/"
- )
-
-internal class KotlinBuildToolsPrePushHandler : AbstractIntelliJProjectPrePushHandler() {
- override fun isAvailable(): Boolean =
- Registry.`is`("kotlin.build.tools.code.ownership.commit.message.enabled", true)
-
- override fun getPresentableName(): @Nls(capitalization = Nls.Capitalization.Title) String =
- DevKitGitBundle.message("push.commit.kotlin.build.tools.handler.name")
-
- override fun isTargetBranchProtected(project: Project, pushInfo: PushInfo): Boolean {
- return super.isTargetBranchProtected(project, pushInfo) || pushInfo.pushSpec.target.presentation == "kt-master"
- }
-
- override fun validate(project: Project, info: PushInfo, indicator: ProgressIndicator): PushInfoValidationResult {
- val matchingCommits = info.commits.filter { commit ->
- commit.changes.asSequence()
- .mapNotNull { it.virtualFile }
- .map { Path.of(it.path) }
- .anyIn(KOTLIN_BUILD_TOOLS_PATHS, KOTLIN_BUILD_TOOLS_PATHS_TO_IGNORE)
- }
-
- if (matchingCommits.isNotEmpty()) {
- val commitsInfo = matchingCommits.toHtml()
- invokeAndWait(indicator.modalityState) {
- MessageDialogBuilder.okCancel(
- DevKitGitBundle.message("push.commit.kotlin.build.tools.review.title"),
- DevKitGitBundle.message("push.commit.kotlin.build.tools.message.lacks.issue.reference.body", commitsInfo)
- )
- .asWarning()
- .ask(project = null)
- }
- }
-
- return PushInfoValidationResult.VALID
- }
-}
diff --git a/plugins/devkit/intellij.devkit.git/src/toolboxPrePushHandlers.kt b/plugins/devkit/intellij.devkit.git/src/toolboxPrePushHandlers.kt
deleted file mode 100644
index f9fc085f30a0..000000000000
--- a/plugins/devkit/intellij.devkit.git/src/toolboxPrePushHandlers.kt
+++ /dev/null
@@ -1,52 +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 org.jetbrains.idea.devkit.commit
-
-import com.intellij.dvcs.push.PushInfo
-import com.intellij.openapi.application.ModalityState
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.MessageDialogBuilder
-import com.intellij.openapi.util.registry.Registry
-import com.intellij.vcs.log.VcsFullCommitDetails
-
-internal class ToolboxPrePushHandler : IssueIDPrePushHandler() {
- override val paths = listOf("toolbox/", "station/")
-
- override val acceptableProjects: List = super.acceptableProjects + listOf(
- "TBX", "IDES"
- )
-
- private val acceptableGroup = listOf(
- "docs", "doc",
- "cleanup", "typo",
- "refactoring", "refactor", "format",
- "tests", "test"
- )
-
- private val groupPattern = Regex("""\b(${acceptableGroup.joinToString("|")})\b.*""", RegexOption.IGNORE_CASE)
-
- override val commitMessageRegex: Regex = Regex(
- "(${buildRegexFromAcceptableProjects().pattern})|(${groupPattern.pattern})",
- setOf(RegexOption.DOT_MATCHES_ALL, RegexOption.IGNORE_CASE)
- )
- override fun isAvailable(): Boolean = Registry.`is`("toolbox.commit.message.validation.enabled", true)
-
- override fun getPresentableName(): String = DevKitGitBundle.message("toolbox.commit.handler.name")
-
- override fun handleCommitsValidationFailure(project: Project, info: PushInfo, commitsToWarnAbout: List, modalityState: ModalityState): Boolean {
- val commitsInfo = commitsToWarnAbout.toHtml()
-
- val commitAsIs = invokeAndWait(modalityState) {
- @Suppress("DialogTitleCapitalization")
- MessageDialogBuilder.yesNo(
- DevKitGitBundle.message("toolbox.push.commit.message.lacks.issue.reference.title"),
- DevKitGitBundle.message("toolbox.push.commit.message.lacks.issue.reference.body", commitsInfo)
- )
- .yesText(DevKitGitBundle.message("push.commit.message.lacks.issue.reference.commit"))
- .noText(DevKitGitBundle.message("push.commit.message.lacks.issue.reference.edit"))
- .asWarning()
- .ask(project)
- }
-
- return commitAsIs
- }
-}
diff --git a/plugins/devkit/intellij.devkit.git/test/IntelliJMonorepoPrePushHandlerTest.kt b/plugins/devkit/intellij.devkit.git/test/IntelliJMonorepoPrePushHandlerTest.kt
deleted file mode 100644
index 423f652be6f2..000000000000
--- a/plugins/devkit/intellij.devkit.git/test/IntelliJMonorepoPrePushHandlerTest.kt
+++ /dev/null
@@ -1,387 +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 org.jetbrains.idea.devkit.commit
-
-import com.intellij.openapi.application.PathManager
-import org.junit.Test
-import org.junit.experimental.runners.Enclosed
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-import org.junit.runners.Parameterized.Parameter
-import java.nio.file.Path
-import java.nio.file.Paths
-import kotlin.io.path.div
-import kotlin.io.path.exists
-import kotlin.io.path.readText
-
-@RunWith(Enclosed::class)
-class IntelliJMonorepoPrePushHandlerTest {
-
- @RunWith(Parameterized::class)
- class FilesBelongToPlatform {
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "{0}")
- fun provideTestParameters(): Iterable> {
- return listOf(
- listOf("${COMMUNITY_PLATFORM}/File.kt"),
- listOf(
- "${COMMUNITY_PLATFORM}/File.kt",
- "root.txt",
- ),
- listOf(
- "${COMMUNITY_PLATFORM}/File.kt",
- "${COMMUNITY}/plugins/stuff.xml",
- "not-important-dir-A/whatever",
- "not-important-dir-B/whatever"
- ),
- listOf("unrelated/$COMMUNITY_PLATFORM/File.kt"),
- )
- }
- }
-
- @Parameter
- lateinit var files: List
-
- @Test
- fun testThatChecksForFileSet() {
- val filesSet = files.asSequence().map { pathAt(it) }
- assert(prePushHandler.containSources(filesSet)) {
- "The following set of files doesn't trigger the check: $filesSet"
- }
- }
- }
-
-
- @RunWith(Parameterized::class)
- class FilesDoNotBelongToPlatform {
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "{0}")
- fun provideTestParameters(): Iterable> {
- return listOf(
- listOf("${COMMUNITY_PLATFORM}/README.md"),
- listOf("${COMMUNITY_PLATFORM}/sub/sub.iml"),
-
- listOf("${COMMUNITY}/File.kt"),
- listOf("${COMMUNITY}/README.md"),
- listOf("${COMMUNITY}/sub/sub.iml"),
- listOf(
- "${COMMUNITY}/plugins/stuff.xml",
- "not-important-dir-A/whatever",
- "not-important-dir-B/whatever",
- ),
- )
- }
- }
-
- @Parameter
- lateinit var files: List
-
- @Test
- fun testThatIgnoresFileSet() {
- val filesSet = files.asSequence().map { pathAt(it) }
- assert(!prePushHandler.containSources(filesSet)) {
- "The following set of files triggered the check: $filesSet"
- }
- }
- }
-
- @RunWith(Parameterized::class)
- class ValidCommitMessages {
-
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "{0}")
- fun provideTestParameters(): Iterable {
- return listOf(
- "IJPL-1", "A-1",
- "IJPL-123", "(IJPL-123)", "[IJPL-123]", "{IJPL-123}", "'IJPL-123'", "`IJPL-123`", "\"IJPL-123\"",
- "IDEA-123", "(IDEA-123)", "[IDEA-123]", "{IDEA-123}", "'IDEA-123'", "`IDEA-123`", "\"IDEA-123\"",
- "IJPL-42",
- "KTIJ-123 ", " KTIJ-123", " KTIJ-123 ", "IDEA-123 ",
- " IDEA-123", " IDEA-123 ",
- "IJPL-123 header",
- "Header IJPL-123",
- "[sub system 123] docs: fix typo",
- "Header IJPL-123 header",
- "IJPL-123 header",
- "Header IJPL-123",
- "Header IJPL-123 header",
- """
- Header IJPL-123 header
-
- Body-line-1
- Body-line-N
- """.trimIndent(),
- """
- Header IJPL-123 header
-
- Body-line-1
- Body-line-N
- """.trimIndent(),
- """
- Header IJPL-123 header
-
- Body-line-1
- Body-line-N
-
- ^IJPL-123 fixed
- """.trimIndent(),
- """
- Header IJPL-123 header
-
- Body-line-1
- Body-line-N
-
- ^IDEA-123 fixed
- """.trimIndent(),
- """
- Header IJPL-42 header
-
- Body-line-1
- Body-line-N
-
- ^IDEA-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- ^IJPL-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- ^IDEA-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- #KTIJ-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- #IDEA-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- Relates to #KTIJ-123
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- Relates to #IDEA-123
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- ^WHATEVER-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- #WHATEVER-123 fixed
- """.trimIndent(),
- """
- Header
-
- Body-line-1
- Body-line-N
-
- Relates to #WHATEVER-123
- """.trimIndent(),
- """
- [subsystem] refactoring: rename a to b
-
- Explains why it is needed.
- """.trimIndent(),
-
- "test thing", "test: thing", "[test] thing", "Test thing",
- "tests thing", "tests: thing", "[tests] thing",
- "cleanup thing", "cleanup: thing", "[cleanup] thing", "Cleanup stuff",
- "clean up thing", "clean up: thing", "[clean up] thing", "Clean Up stuff",
- "docs thing", "docs: thing", "[docs] thing", "Docs thing",
- "doc thing", "doc: thing", "[doc] thing", "Doc very much",
- "typo thing", "typo: thing", "[typo] thing",
- "format thing", "format: thing", "[format] thing",
- "style thing", "style: thing", "[style] thing",
- "refactor this thing", "refactor: this thing",
- "WIP", "[WIP] do stuff", "Add thingies WIP", "wip", "(wip) hoho", "wip: haha",
- """
- WIP
-
- Some additional remarks.
- """.trimIndent(),
-
- "Cleanup (reason)",
- "[subsystem][tests] new tests",
- "[subsystem] docs: fix typo",
- "[smth][refactoring] do stuff",
-
- "[testFramework] whatever",
- "[test framework] whatever",
- "test framework",
- "Rename .java to .kt"
- )
- }
- }
-
- @Parameter
- lateinit var commitMessage: String
-
- @Test
- fun testThatCommitMessageIsValid() {
- assert(prePushHandler.isCommitMessageCorrect(commitMessage)) {
- "The following commit message was considered invalid: $commitMessage"
- }
- }
- }
-
- @RunWith(Parameterized::class)
- class InvalidCommitMessages {
-
- companion object {
- @JvmStatic
- @Parameterized.Parameters(name = "{0}")
- fun provideTestParameters(): Iterable {
- return listOf(
- "",
- "IJPL",
- "IJPL-",
- "IJPL-one",
- "IJPL 1",
- "IJPL111",
- "Text IJPL Text",
- "something-something",
- "2-fold",
- "AB-RA-CA-DA-BRA-1",
- """"
- Header
-
- Body-line-1
- Body-line-N
- """.trimIndent(),
- """
- No explanation
-
- Test added
- """.trimIndent(),
- """
- No explanation
-
- WIP
- """.trimIndent(),
-
- "test", "test:", "[test]", "test ", "add test", "drop test",
- "tests", "tests:", "[tests]", "tests ", "add tests", "drop tests",
- "cleanup", "cleanup:", "[cleanup]", "cleanup ", "do cleanup",
- "clean up", "clean up:", "[clean up]", "clean up ", "do clean up",
- "docs", "docs:", "[docs]", "docs ", "add docs",
- "doc", "doc:", "[doc]", "doc ", "add doc",
- "typo", "typo:", "[typo]", "typo ", "fix typo",
- "format", "format:", "[format]", "fix format", "fix formatting",
- "style", "style:", "[style]", "fix style",
-
- "stuff", "stuff:", "[stuff]", "very important stuff",
- "refactor", "refactor:", "[refactor]",
- "refactoring", "refactoring:", "[refactoring]",
- "wipe", "swipe", "wipe the db",
-
- "[subsystem] Do very important stuff very very important",
- "platform: add 'thing' here and there",
- "subsystem tests: use junit5 instead of junit4",
- "subsystem: cleanup",
- "cool: 5 new tests",
- "Fix test",
- "[subsystem] docs",
- "null",
-
- "IJ-CR-160532 do not highlight parser errors twice for java",
- "IJ-MR-123", "IJ-CR-0",
- )
- }
- }
-
- @Parameter
- lateinit var commitMessage: String
-
- @Test
- fun testThatCommitMessageIsValid() {
- assert(!prePushHandler.isCommitMessageCorrect(commitMessage)) {
- "The following commit message was considered as valid: $commitMessage"
- }
- }
- }
-
- class ContributingMdCommitMessagesAreValid {
- @Test
- fun testCommitMessagesFromContributingMd() {
- val contributingFile = Path.of(PathManager.getCommunityHomePath()) / "CONTRIBUTING.md"
- assert(contributingFile.exists()) { "CONTRIBUTING.md file not found at expected location" }
-
- val content = contributingFile.readText()
- val commitMessages = extractCommitMessagesFromMarkdown(content)
-
- assert(commitMessages.isNotEmpty()) { "No commit messages found in CONTRIBUTING.md" }
-
- commitMessages.forEach { commitMessage ->
- assert(prePushHandler.isCommitMessageCorrect(commitMessage)) {
- "Commit message from CONTRIBUTING.md is invalid: '$commitMessage'"
- }
- }
- }
-
- private fun extractCommitMessagesFromMarkdown(content: String): List {
- val codeBlockRegex = Regex("```(.*?)```", RegexOption.DOT_MATCHES_ALL)
- val commitMessages = mutableListOf()
-
- codeBlockRegex.findAll(content).forEach { match ->
- val codeBlock = match.groupValues[1].trim()
-
- if (codeBlock.contains("[<") && codeBlock.contains(">]")) {
- return@forEach
- }
-
- if (codeBlock.isNotEmpty()) {
- commitMessages.add(codeBlock)
- }
- }
-
- return commitMessages
- }
- }
-}
-
-private val prePushHandler = IntelliJMonorepoPrePushHandler()
-private val tempDir: String = System.getProperty("java.io.tmpdir")
-private const val COMMUNITY_PLATFORM = "community/platform/"
-private const val COMMUNITY = "community/"
-
-private fun pathAt(path: String): Path {
- return Paths.get(tempDir, *path.split("/").filterNot { it.isEmpty() }.toTypedArray())
-}
\ No newline at end of file
diff --git a/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml b/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml
index 0f6d2432369b..88c65b0c7e51 100644
--- a/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml
+++ b/plugins/devkit/intellij.devkit.plugin.main.noKotlin.iml
@@ -7,7 +7,6 @@
-
diff --git a/plugins/devkit/plugin-content.yaml b/plugins/devkit/plugin-content.yaml
index ebf3eeb65e93..6b739cf20948 100644
--- a/plugins/devkit/plugin-content.yaml
+++ b/plugins/devkit/plugin-content.yaml
@@ -9,7 +9,6 @@
- name: intellij.devkit
contentModules:
- name: intellij.devkit.core
- - name: intellij.devkit.git
- name: intellij.devkit.gradle
- name: intellij.devkit.i18n
- name: intellij.devkit.intelliLang
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index f4031b148dcd..1a396ad27b28 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -29,7 +29,6 @@
-