From 364e62155de53c3d977b54953a262d7a256d2cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:15:16 +0100
Subject: [PATCH] refactor(ant): extract completion function
---
plugins/ant/README.md | 4 ++--
plugins/ant/_ant | 22 ++++++++++++++++++++++
plugins/ant/ant.plugin.zsh | 16 ----------------
3 files changed, 24 insertions(+), 18 deletions(-)
create mode 100644 plugins/ant/_ant
delete mode 100644 plugins/ant/ant.plugin.zsh
diff --git a/plugins/ant/README.md b/plugins/ant/README.md
index 5f88984ac..571237223 100644
--- a/plugins/ant/README.md
+++ b/plugins/ant/README.md
@@ -2,9 +2,9 @@
This plugin provides completion for [Ant](https://ant.apache.org/).
-To use it add ant to the plugins array in your zshrc file.
+To use it, add `ant` to the plugins array in your zshrc file:
-```bash
+```zsh
plugins=(... ant)
```
diff --git a/plugins/ant/_ant b/plugins/ant/_ant
new file mode 100644
index 000000000..24a8e3667
--- /dev/null
+++ b/plugins/ant/_ant
@@ -0,0 +1,22 @@
+#compdef ant
+
+_ant_does_target_list_need_generating () {
+ [[ ! -f .ant_targets ]] && return 0
+ [[ build.xml -nt .ant_targets ]] && return 0
+ return 1
+}
+
+_ant () {
+ if [[ ! -f build.xml ]]; then
+ return
+ fi
+
+ if ! _ant_does_target_list_need_generating; then
+ return
+ fi
+
+ ant -p | awk -F " " 'NR > 5 { print lastTarget } { lastTarget = $1 }' >| .ant_targets
+ compadd -- "$(cat .ant_targets)"
+}
+
+_ant "$@"
diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
deleted file mode 100644
index 0b738c94f..000000000
--- a/plugins/ant/ant.plugin.zsh
+++ /dev/null
@@ -1,16 +0,0 @@
-_ant_does_target_list_need_generating () {
- [ ! -f .ant_targets ] && return 0;
- [ build.xml -nt .ant_targets ] && return 0;
- return 1;
-}
-
-_ant () {
- if [ -f build.xml ]; then
- if _ant_does_target_list_need_generating; then
- ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
- fi
- compadd -- `cat .ant_targets`
- fi
-}
-
-compdef _ant ant