From f7170d0ee78aacaadbb18335e39850850b0fe55f Mon Sep 17 00:00:00 2001
From: rockandska <yoann_mac_donald@hotmail.com>
Date: Tue, 18 Oct 2022 14:20:35 +0200
Subject: [PATCH] fix(gradle-properties): use prev and
 __gradle-options-arguments

Signed-off-by: rockandska <yoann_mac_donald@hotmail.com>
---
 gradle-completion.bash | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/gradle-completion.bash b/gradle-completion.bash
index e830b53..4954c4a 100644
--- a/gradle-completion.bash
+++ b/gradle-completion.bash
@@ -139,21 +139,22 @@ __gradle-properties() {
     local cur
     _get_comp_words_by_ref -n : cur
 
-    local args="-Dorg.gradle.cache.reserved.mb=   - Reserve Gradle Daemon memory for operations
--Dorg.gradle.caching=             - Set true to enable Gradle build cache
--Dorg.gradle.console=             - Set type of console output to generate (plain auto rich verbose)
--Dorg.gradle.daemon.debug=        - Set true to debug Gradle Daemon
--Dorg.gradle.daemon.idletimeout=  - Kill Gradle Daemon after # idle millis
--Dorg.gradle.debug=               - Set true to debug Gradle Client
--Dorg.gradle.jvmargs=             - Set JVM arguments
--Dorg.gradle.java.home=           - Set JDK home dir
--Dorg.gradle.logging.level=       - Set default Gradle log level (quiet warn lifecycle info debug)
--Dorg.gradle.parallel=            - Set true to enable parallel project builds (incubating)
--Dorg.gradle.priority=            - Set priority for Gradle worker processes (low normal)
--Dorg.gradle.unsafe.watch-fs=     - Set true to enable Gradle file watcher
--Dorg.gradle.warning.mode=        - Set types of warnings to log (all summary none)
--Dorg.gradle.workers.max=         - Set the number of workers Gradle is allowed to use"
+    local args="org.gradle.cache.reserved.mb=   - Reserve Gradle Daemon memory for operations
+org.gradle.caching=             - Set true to enable Gradle build cache
+org.gradle.console=             - Set type of console output to generate (plain auto rich verbose)
+org.gradle.daemon.debug=        - Set true to debug Gradle Daemon
+org.gradle.daemon.idletimeout=  - Kill Gradle Daemon after # idle millis
+org.gradle.debug=               - Set true to debug Gradle Client
+org.gradle.jvmargs=             - Set JVM arguments
+org.gradle.java.home=           - Set JDK home dir
+org.gradle.logging.level=       - Set default Gradle log level (quiet warn lifecycle info debug)
+org.gradle.parallel=            - Set true to enable parallel project builds (incubating)
+org.gradle.priority=            - Set priority for Gradle worker processes (low normal)
+org.gradle.unsafe.watch-fs=     - Set true to enable Gradle file watcher
+org.gradle.warning.mode=        - Set types of warnings to log (all summary none)
+org.gradle.workers.max=         - Set the number of workers Gradle is allowed to use"
     COMPREPLY=( $(compgen -W "$args" -- "$cur") )
+    type compopt &>/dev/null && compopt -o nospace
     return 0
 }
 
@@ -250,6 +251,10 @@ __gradle-options-arguments() {
             COMPREPLY=( $(compgen -d "$cur") )
             return 0
             ;;
+        -D|--system-prop)
+            __gradle-properties
+            return 0
+            ;;
         *)
             __gradle-tasks
             return 0
@@ -350,8 +355,6 @@ _gradle() {
 
     if [[ ${cur} == --* ]]; then
         __gradle-long-options
-    elif [[ ${cur} == -D* ]]; then
-        __gradle-properties
     elif [[ ${cur} == -* ]]; then
         __gradle-short-options
     elif [[ ${prev} == -* ]]; then