ulimit: improvements when -a is specified

scop · Apr 14, 2019 · 6bc7bba · 6bc7bba
1 parent 2bf12d7
commit 6bc7bba
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/completions/ulimit b/completions/ulimit
@@ -5,9 +5,12 @@ _ulimit()
     local cur prev words cword
     _init_completion || return
 
+    # TODO combined option support (-aH, -Sc etc)
+
     local mode
     case $prev in
         -a)
+            COMPREPLY=( $( compgen -W "-S -H" -- "$cur" ) )
             return
             ;;
         -[SH])
@@ -17,9 +20,16 @@ _ulimit()
             ;;
     esac
 
-    if [[ -z "$mode" && "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
-        return
+    if [[ -z "$mode" ]]; then
+        local word
+        for word in "${words[@]}"; do
+            [[ $word == -*a* ]] && return
+        done
+
+        if [[ "$cur" == -* ]]; then
+            COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
+            return
+        fi
     fi
 
     local args

diff --git a/test/t/test_ulimit.py b/test/t/test_ulimit.py
@@ -28,4 +28,9 @@ def test_5(self, completion):
 
     @pytest.mark.complete("ulimit -a ")
     def test_6(self, completion):
+        assert completion == sorted("-S -H".split())
+
+    @pytest.mark.complete("ulimit -a -H -")
+    def test_7(self, completion):
+        """Test modes are NOT completed with -a given somewhere."""
         assert not completion