fix(cd): generate only cdable_vars containing valid directory paths

Author: akinomyoga

completions/cd

@@ -4,7 +4,16 @@ _comp_cmd_cd__compgen_cdable_vars()
 {
     shopt -q cdable_vars || return 1
 
-    _comp_compgen -- -v
+    local vars
+    _comp_compgen -v vars -- -v || return "$?"
+
+    # Remove variables that do not contain a valid directory path.
+    local _i
+    for _i in "${!vars[@]}"; do
+        [[ -d ${!vars[_i]} ]] || unset -v 'vars[_i]'
+    done
+
+    _comp_compgen -U vars set "${vars[@]}"
 }
 
 # This generator function observes the CDPATH variable, to additionally

test/t/test_cd.py

@@ -1,5 +1,7 @@
 import pytest
 
+from conftest import assert_complete, bash_env_saved
+
 
 @pytest.mark.bashcomp(ignore_env=r"^\+CDPATH=$")
 class TestCd:
@@ -28,3 +30,15 @@ def test_dir_at_point(self, completion):
     @pytest.mark.complete("cd -")
     def test_options(self, completion):
         assert completion
+
+    def test_cdable_vars(self, bash):
+        with bash_env_saved(bash) as bash_env:
+            bash_env.shopt("cdable_vars", True)
+            bash_env.write_variable("foo1", "shared")
+            bash_env.write_variable("foo2", "shared/default")
+            bash_env.write_variable("foo3", "nonexistent")
+            bash_env.write_variable("foo4", "nonexistent")
+            bash_env.write_variable("foo5", "shared/detault/foo")
+            bash_env.write_variable("foo6", "shared/detault/bar")
+            completion = assert_complete(bash, "cd f")
+            assert completion == ["foo1", "foo2"]