fix(cd): fix cdable_vars overwritten by another generator

Author: akinomyoga

completions/cd

@@ -72,7 +72,7 @@ _comp_cmd_cd()
 
     compopt -o filenames
     _comp_cmd_cd__compgen_cdable_vars
-    _comp_cmd_cd__compgen_cdpath
+    _comp_compgen -ai cd cdpath
     _comp_compgen -a filedir -d
 }
 complete -F _comp_cmd_cd -o nospace cd pushd

test/t/test_cd.py

@@ -42,3 +42,12 @@ def test_cdable_vars(self, bash):
             bash_env.write_variable("foo6", "shared/default/bar")
             completion = assert_complete(bash, "cd f")
             assert completion == ["foo1", "foo2"]
+
+    def test_cdable_vars_2(self, bash):
+        with bash_env_saved(bash) as bash_env:
+            bash_env.write_variable("CDPATH", "nonexistent")
+            bash_env.shopt("cdable_vars", True)
+            bash_env.write_variable("foo1", "shared")
+            bash_env.write_variable("foo2", "shared/default")
+            completion = assert_complete(bash, "cd f")
+            assert completion == ["foo1", "foo2"]