commit 83885ee5c59489a2698d570ece87dbaac8b3e71f Author: Shautvast Date: Mon Sep 29 20:08:22 2025 +0200 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..84a091f --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store +# Project exclude paths +/.intellijPlatform/ \ No newline at end of file diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml new file mode 100644 index 0000000..7747a29 --- /dev/null +++ b/.run/Run IDE with Plugin.run.xml @@ -0,0 +1,24 @@ + + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..d6ca285 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# Autoprefix-commit +A simple intellij plugin that puts the current branch name in front of the commit message +* Updates the branch every time the commit dialog is focussed +* Puts the branch name in front of any pre-existing text (unless the branch name was already there) +* No config for other fixed characters +* Tested on IntelliJ 2025.x \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..b5e4e7f --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,52 @@ +plugins { + id("java") + id("org.jetbrains.kotlin.jvm") version "1.9.20" + id("org.jetbrains.intellij.platform") version "2.3.0" +} + +group = "com.github.shautvast" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() + intellijPlatform { + defaultRepositories() + } +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + intellijPlatform { + create("IC", "2024.2.5") + testFramework(org.jetbrains.intellij.platform.gradle.TestFrameworkType.Platform) + bundledPlugin("Git4Idea") + } + + +} + +intellijPlatform { + pluginConfiguration { + ideaVersion { + sinceBuild = "242" + } + + changeNotes = """ + Initial version: insert branchname in commit dialog. No configuration needed. + """.trimIndent() + } +} + +tasks { + // Set the JVM compatibility versions + withType { + sourceCompatibility = "21" + targetCompatibility = "21" + } + withType { + kotlinOptions.jvmTarget = "21" + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..24630b3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib +kotlin.stdlib.default.dependency=false +# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html +org.gradle.configuration-cache=true +# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html +org.gradle.caching=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e382118 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..81f00e7 --- /dev/null +++ b/gradlew @@ -0,0 +1,237 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$(ls -ld "$app_path") + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$(cd "${APP_HOME:-./}" && pwd -P) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn() { + echo "$*" +} >&2 + +die() { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$(uname)" in #( +CYGWIN*) cygwin=true ;; #( +Darwin*) darwin=true ;; #( +MSYS* | MINGW*) msys=true ;; #( +NONSTOP*) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ]; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop"; then + case $MAX_FD in #( + max*) + MAX_FD=$(ulimit -H -n) || + warn "Could not query maximum file descriptor limit" + ;; + esac + case $MAX_FD in #( + '' | soft) : ;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + ;; + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys"; then + APP_HOME=$(cygpath --path --mixed "$APP_HOME") + CLASSPATH=$(cygpath --path --mixed "$CLASSPATH") + + JAVACMD=$(cygpath --unix "$JAVACMD") + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg; do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) + t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] + ;; #( + *) false ;; + esac + then + arg=$(cygpath --path --ignore --mixed "$arg") + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c9f0996 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "autoprefix-commit" \ No newline at end of file diff --git a/src/main/kotlin/nl/topsquad/autoprefixcommit/APCProjectActivity.kt b/src/main/kotlin/nl/topsquad/autoprefixcommit/APCProjectActivity.kt new file mode 100644 index 0000000..5c156a4 --- /dev/null +++ b/src/main/kotlin/nl/topsquad/autoprefixcommit/APCProjectActivity.kt @@ -0,0 +1,12 @@ +package nl.topsquad.autoprefixcommit + +import com.intellij.openapi.diagnostic.thisLogger +import com.intellij.openapi.project.Project +import com.intellij.openapi.startup.ProjectActivity + +class APCProjectActivity: ProjectActivity { + + override suspend fun execute(project : Project){ + thisLogger().warn("Autoprefixer Commit is active") + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/topsquad/autoprefixcommit/AlternativeBranchNameHandler.kt b/src/main/kotlin/nl/topsquad/autoprefixcommit/AlternativeBranchNameHandler.kt new file mode 100644 index 0000000..f55f1fd --- /dev/null +++ b/src/main/kotlin/nl/topsquad/autoprefixcommit/AlternativeBranchNameHandler.kt @@ -0,0 +1,35 @@ +package nl.topsquad.autoprefixcommit + +import com.intellij.openapi.vcs.CheckinProjectPanel +import com.intellij.openapi.vcs.changes.CommitContext +import com.intellij.openapi.vcs.checkin.CheckinHandler +import com.intellij.openapi.vcs.checkin.CheckinHandlerFactory +import git4idea.repo.GitRepositoryManager + +/** + * Alternative implementation that modifies the commit message right before commit + */ +class AlternativeBranchNameHandlerFactory : CheckinHandlerFactory() { + override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { + return object : CheckinHandler() { + + override fun beforeCheckin(): ReturnResult { + val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull() + repository?.let { + val currentBranch = it.currentBranchName + val currentMessage = panel.commitMessage + + if (currentBranch != null && !currentMessage.contains(currentBranch)) { + val newMessage = if (currentMessage.isEmpty()) { + "$currentBranch: " + } else { + "$currentBranch: $currentMessage" + } + panel.commitMessage = newMessage + } + } + return ReturnResult.COMMIT + } + } + } +} diff --git a/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCheckinHandler.kt b/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCheckinHandler.kt new file mode 100644 index 0000000..46f841f --- /dev/null +++ b/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCheckinHandler.kt @@ -0,0 +1,41 @@ +package nl.topsquad.autoprefixcommit + +import com.intellij.openapi.vcs.CheckinProjectPanel +import com.intellij.openapi.vcs.changes.CommitContext +import com.intellij.openapi.vcs.checkin.CheckinHandler +import com.intellij.openapi.vcs.checkin.CheckinHandlerFactory +import git4idea.repo.GitRepositoryManager + +/** + * Handles Git branch name injection into commit messages when the commit dialog is opened + */ +class BranchNameCheckinHandlerFactory : CheckinHandlerFactory() { + + override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { + return object : CheckinHandler() { + init { + (panel.preferredFocusedComponent)?.addFocusListener(object : java.awt.event.FocusAdapter() { + override fun focusGained(e: java.awt.event.FocusEvent?) { + // update commit message + val currentMessage = panel.commitMessage + val modifiedMessage = modifyCommitMessage(currentMessage) + panel.commitMessage = modifiedMessage + } + }) + } + + fun modifyCommitMessage(message: String): String { + val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull() + + return repository?.let { + val branchName = it.currentBranchName; + if (branchName != null && !message.startsWith("${branchName} ")) { + "${it.currentBranchName ?: ""} ${message} " + } else { + message + } + } ?: message + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCommitMessageProvider.kt b/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCommitMessageProvider.kt new file mode 100644 index 0000000..fae9463 --- /dev/null +++ b/src/main/kotlin/nl/topsquad/autoprefixcommit/BranchNameCommitMessageProvider.kt @@ -0,0 +1,19 @@ +package nl.topsquad.autoprefixcommit + +import com.intellij.openapi.project.Project +import com.intellij.openapi.vcs.changes.LocalChangeList +import com.intellij.openapi.vcs.changes.ui.CommitMessageProvider +import com.intellij.util.diff.Diff +import git4idea.repo.GitRepositoryManager +import org.jetbrains.annotations.NotNull + +class BranchNameCommitMessageProvider: CommitMessageProvider { + override fun getCommitMessage(@NotNull forChangelist: LocalChangeList, project: Project): String? { + val repository = GitRepositoryManager.getInstance(project).repositories.firstOrNull() + repository?.let { + val currentBranch = it.currentBranchName + return currentBranch + } + return "" + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/topsquad/autoprefixcommit/DelayedBranchNameHandler.kt b/src/main/kotlin/nl/topsquad/autoprefixcommit/DelayedBranchNameHandler.kt new file mode 100644 index 0000000..1fb2927 --- /dev/null +++ b/src/main/kotlin/nl/topsquad/autoprefixcommit/DelayedBranchNameHandler.kt @@ -0,0 +1,47 @@ +package nl.topsquad.autoprefixcommit + +import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.vcs.CheckinProjectPanel +import com.intellij.openapi.vcs.changes.CommitContext +import com.intellij.openapi.vcs.checkin.CheckinHandler +import com.intellij.openapi.vcs.checkin.CheckinHandlerFactory +import git4idea.repo.GitRepositoryManager +import javax.swing.Timer + +/** + * Implementation that uses a timer to delay commit message modification + */ +class DelayedBranchNameHandlerFactory : CheckinHandlerFactory() { + override fun createHandler(panel: CheckinProjectPanel, commitContext: CommitContext): CheckinHandler { + return object : CheckinHandler() { + + init { + // Use a timer to delay the modification slightly + val timer = Timer(100) { // 100ms delay + ApplicationManager.getApplication().invokeLater { + modifyCommitMessage(panel) + } + } + timer.isRepeats = false + timer.start() + } + + private fun modifyCommitMessage(panel: CheckinProjectPanel) { + val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull() + repository?.let { + val currentBranch = it.currentBranchName + val currentMessage = panel.commitMessage + + if (currentBranch != null && !currentMessage.contains(currentBranch)) { + val newMessage = if (currentMessage.isEmpty()) { + "$currentBranch: " + } else { + "$currentBranch: $currentMessage" + } + panel.commitMessage = newMessage + } + } + } + } + } +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml new file mode 100644 index 0000000..b000183 --- /dev/null +++ b/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,20 @@ + + nl.top-squad.autoprefix-commit + + Autoprefix Commit Messages + + TopSquad + + + + com.intellij.modules.platform + Git4Idea + + + + + + diff --git a/src/main/resources/META-INF/pluginIcon.svg b/src/main/resources/META-INF/pluginIcon.svg new file mode 100644 index 0000000..dcf6b99 --- /dev/null +++ b/src/main/resources/META-INF/pluginIcon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file