Merge pull request #1554 from akinomyoga/test-xspec

perf(_comp_compgen_filedir_xspec): avoid double negation `!(!(...))`

Author: scop

bash_completion

@@ -3264,14 +3264,14 @@ _comp_compgen_filedir_xspec()
     # https://lists.gnu.org/archive/html/bug-bash/2010-09/msg00036.html
     # news://news.gmane.io/4C940E1C.1010304@case.edu
     eval xspec="${xspec}"
-    local matchop=!
     if [[ $xspec == !* ]]; then
         xspec=${xspec#!}
-        matchop=@
+        xspec="@(|!($xspec|${xspec^^}))"
+    else
+        xspec="@(|$xspec|${xspec^^})"
     fi
-    xspec="$matchop($xspec|${xspec^^})"
 
-    _comp_compgen -av toks -c "$quoted" -- -f -X "@(|!($xspec))"
+    _comp_compgen -av toks -c "$quoted" -- -f -X "$xspec"
 
     # Try without filter if it failed to produce anything and configured to
     [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-} && ${#toks[@]} -lt 1 ]] &&

test/fixtures/_filedir_xspec/a.txt

@@ -5,6 +5,7 @@ EXTRA_DIST = \
 	test_unit_compgen_available_interfaces.py \
 	test_unit_compgen_commands.py \
 	test_unit_compgen_filedir.py \
+	test_unit_compgen_filedir_xspec.py \
 	test_unit_compgen_ip_addresses.py \
 	test_unit_compgen_known_hosts.py \
 	test_unit_compgen_pgids.py \

test/fixtures/_filedir_xspec/b.TXT

@@ -0,0 +1,36 @@
+import pytest
+
+from conftest import assert_bash_exec, assert_complete
+
+
+@pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=|^[-+]_comp_xspecs=")
+class TestUnitFiledirXspec:
+    @pytest.fixture(scope="class")
+    def functions(self, request, bash):
+        assert_bash_exec(
+            bash,
+            "_comp_xspecs[xspec1]='!*.txt'; "
+            "_comp_xspecs[xspec2]=; "
+            "_comp_xspecs[xspec4]='*.txt'; "
+            "complete -F _filedir_xspec xspec{1..4}",
+        )
+
+    def test_1(self, bash, functions):
+        """Test the pattern for an extension"""
+        completion = assert_complete(bash, "xspec1 ", cwd="_filedir_xspec")
+        assert completion == sorted("a.txt b.TXT".split())
+
+    def test_2(self, bash, functions):
+        """Test an empty _comp_xspecs entry"""
+        completion = assert_complete(bash, "xspec2 ", cwd="_filedir_xspec")
+        assert completion == sorted("a.txt b.TXT c.dat d.bin".split())
+
+    def test_3(self, bash, functions):
+        """Test an unset _comp_xspecs entry"""
+        completion = assert_complete(bash, "xspec3 ", cwd="_filedir_xspec")
+        assert completion == sorted("a.txt b.TXT c.dat d.bin".split())
+
+    def test_4(self, bash, functions):
+        """Test an exclusion pattern"""
+        completion = assert_complete(bash, "xspec4 ", cwd="_filedir_xspec")
+        assert completion == sorted("c.dat d.bin".split())