summaryrefslogtreecommitdiff
path: root/plugins/gradle
diff options
context:
space:
mode:
authorErik Zivkovic <erik.zivkovic@gmail.com>2016-09-15 12:16:46 +0200
committerMarc Cornellà <marc.cornella@live.com>2016-09-15 12:16:46 +0200
commite46843685c1f337e1266a51c9cae1889c4ae9eba (patch)
treede6206965e6e4ad2c8f8e4410522b2cd9f335663 /plugins/gradle
parent59c66dbfc2b4749c3311550fa605e1e4fcf9496c (diff)
downloadzsh-e46843685c1f337e1266a51c9cae1889c4ae9eba.tar.gz
zsh-e46843685c1f337e1266a51c9cae1889c4ae9eba.tar.bz2
zsh-e46843685c1f337e1266a51c9cae1889c4ae9eba.zip
Improve gradle plugin task parsing (#5230)
* Improve gradle plugin task parsing Added _gradle and _gradlew as symbolic links to gradle.plugin.zsh, otherwise the plugin was not properly loaded. Output from `gradlew tasks --all` is now parsed in two levels, first we find segments between `------...` and a newline. Second, all those lines are parsed and cleaned using awk and added to .gradletasknamecache. Tested on gradle 2.13, and gradlew 2.14. * Remove .gradletasknamecache before regenerating it Remove the .gradletasknamecache file to avoid having an unnecessary newline at the top of the file when regenerating it. * Improve gradle task parsing by writing .gradletasknamecache atomically Previously the .gradletasknamecache file was written line by line inside a parsing loop, which could cause errors such as half-written cache files if the process was aborted. This also removes the need of deleting the .gradletasknamecache file before parsing.
Diffstat (limited to 'plugins/gradle')
l---------plugins/gradle/_gradle1
l---------plugins/gradle/_gradlew1
-rw-r--r--plugins/gradle/gradle.plugin.zsh33
3 files changed, 33 insertions, 2 deletions
diff --git a/plugins/gradle/_gradle b/plugins/gradle/_gradle
new file mode 120000
index 000000000..80723f2fc
--- /dev/null
+++ b/plugins/gradle/_gradle
@@ -0,0 +1 @@
+gradle.plugin.zsh \ No newline at end of file
diff --git a/plugins/gradle/_gradlew b/plugins/gradle/_gradlew
new file mode 120000
index 000000000..80723f2fc
--- /dev/null
+++ b/plugins/gradle/_gradlew
@@ -0,0 +1 @@
+gradle.plugin.zsh \ No newline at end of file
diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index a908eaeaa..b2015a351 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -60,6 +60,35 @@ _gradle_does_task_list_need_generating () {
[[ ! -f .gradletasknamecache ]] || [[ build.gradle -nt .gradletasknamecache ]]
}
+##############
+# Parse the tasks from `gradle(w) tasks --all` into .gradletasknamecache
+# All lines in the output from gradle(w) that are between /^-+$/ and /^\s*$/
+# are considered to be tasks. If and when gradle adds support for listing tasks
+# for programmatic parsing, this method can be deprecated.
+##############
+_gradle_parse_tasks () {
+ lines_might_be_tasks=false
+ task_name_buffer=""
+ while read -r line; do
+ if [[ $line =~ ^-+$ ]]; then
+ lines_might_be_tasks=true
+ # Empty buffer, because it contains items that are not tasks
+ task_name_buffer=""
+ elif [[ $line =~ ^\s*$ ]]; then
+ if [[ "$lines_might_be_tasks" = true ]]; then
+ # If a newline is found, send the buffer to .gradletasknamecache
+ while read -r task; do
+ echo $task | awk '/[a-zA-Z0-9:-]+/ {print $1}'
+ done <<< "$task_name_buffer"
+ # Empty buffer, because we are done with the tasks
+ task_name_buffer=""
+ fi
+ lines_might_be_tasks=false
+ elif [[ "$lines_might_be_tasks" = true ]]; then
+ task_name_buffer="${task_name_buffer}\n${line}"
+ fi
+ done <<< "$1"
+}
##############################################################################
# Discover the gradle tasks by running "gradle tasks --all"
@@ -68,7 +97,7 @@ _gradle_tasks () {
if [[ -f build.gradle ]]; then
_gradle_arguments
if _gradle_does_task_list_need_generating; then
- gradle tasks --all | awk '/[a-zA-Z0-9:-]* - / {print $1}' > .gradletasknamecache
+ _gradle_parse_tasks "$(gradle tasks --all)" > .gradletasknamecache
fi
compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache)
fi
@@ -78,7 +107,7 @@ _gradlew_tasks () {
if [[ -f build.gradle ]]; then
_gradle_arguments
if _gradle_does_task_list_need_generating; then
- ./gradlew tasks --all | awk '/[a-zA-Z0-9:-]* - / {print $1}' > .gradletasknamecache
+ _gradle_parse_tasks "$(./gradlew tasks --all)" > .gradletasknamecache
fi
compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache)
fi