mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-19 19:42:17 +02:00
Code

Make possible to commit hunks again on Kotlin

Browse Source 
Replaced the old runKtlint() code with the one generated by `./gradlew addKtlintFormatGitPreCommitHook`

for reference, see https://github.com/JLLeitschuh/ktlint-gradle#additional-helper-tasks, and for the implementation, https://github.com/JLLeitschuh/ktlint-gradle/blob/master/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt
This commit is contained in:
Brayan Oliveira 2022-08-10 06:56:37 -03:00 committed by David Allison
parent 71072fbb94
commit aa8df7c032
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pre-commit
View File

@ -2,34 +2,49 @@
set -e
runKtlint () {
CHANGED_KT_FILES="$(git --no-pager diff --name-status --no-color --cached | awk '$1 != "D" && $2 ~ /\.kts|\.kt/ { print $2 }')"
# Following code was generated automatically by running ./gradlew addKtlintFormatGitPreCommitHook
# for reference, see https://github.com/JLLeitschuh/ktlint-gradle#additional-helper-tasks
# and for the implementation, https://github.com/JLLeitschuh/ktlint-gradle/blob/master/plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt
# The only change made was replacing "exit" for "return", as this is running inside a function
######## KTLINT-GRADLE HOOK START ########
if [ -z "$CHANGED_KT_FILES" ]; then
echo "No Kotlin staged files. Hence, skipping pre-commit Ktlint run."
CHANGED_FILES="$(git --no-pager diff --name-status --no-color --cached | awk '$1 != "D" && $NF ~ /\.kts?$/ { print $NF }')"
if [ -z "$CHANGED_FILES" ]; then
echo "No Kotlin staged files."
return 0
fi;
echo "Running Ktlint over these files:"
echo "$CHANGED_KT_FILES"
echo "Running ktlint over these files:"
echo "$CHANGED_FILES"
diff=.git/unstaged-ktlint-git-hook.diff
git diff --color=never > $diff
if [ -s $diff ]; then
git apply -R $diff
fi
# -q removes noise from the output if it fails.
# TODO: -w is better, but https://github.com/JLLeitschuh/ktlint-gradle/issues/457 adds noise
# -w should display: "CriticalExceptionTest.kt:19:1 Wildcard import (cannot be auto-corrected)"
# Cleaning and retrying only if the ktlint fails
if ! ./gradlew -q ktlintFormat ; then
echo "Cleaning the project and retrying."
# Clean is required because of https://github.com/ankidroid/Anki-Android/issues/9521
./gradlew clean
./gradlew -q ktlintFormat
fi;
./gradlew --quiet ktlintFormat -PinternalKtlintGitFilter="$CHANGED_FILES"
gradle_command_exit_code=$?
echo "Completed ./gradlew ktlintFormat run."
echo "$CHANGED_KT_FILES" | while read -r file; do
if [ -f "$file" ]; then
git add "$file"
echo "Completed ktlint run."
echo "$CHANGED_FILES" | while read -r file; do
if [ -f $file ]; then
git add $file
fi
done
if [ -s $diff ]; then
git apply --ignore-whitespace $diff
fi
rm $diff
unset diff
echo "Completed ktlint hook."
exit $gradle_command_exit_code
######## KTLINT-GRADLE HOOK END ########
}
runPrettier () {