fix(export): suffix "=" only when unique and already complete

Author: akinomyoga

.typos.toml

@@ -67,3 +67,8 @@ ser = "ser"
 
 [files]
 extend-exclude = ["CHANGELOG.md"]
+
+# test/t/test_export.py
+[type.test_export]
+extend-glob = ["test_export.py"]
+extend-identifiers = { BASH_VERSIO = "BASH_VERSIO" }

completions-core/export.bash

@@ -52,12 +52,13 @@ _comp_cmd_export()
                 _comp_compgen -a -- -W '-p'
                 return
             fi
-            local suffix=""
+            _comp_compgen -- -A "$action"
             if [[ ! $remove && $action != function ]]; then
-                suffix="="
                 compopt -o nospace
+                if ((${#COMPREPLY[@]} == 1)) && [[ ${COMPREPLY[0]} == "$cur" ]]; then
+                    COMPREPLY[0]+="="
+                fi
             fi
-            _comp_compgen -- -A "$action" -S "$suffix"
             ;;
     esac
 } &&

test/t/test_export.py

@@ -36,16 +36,55 @@ def test_7(self, completion):
     def test_8(self, completion):
         assert completion
 
+    @pytest.mark.complete("export BASH_VERSIO")
+    def test_no_equals_sign_for_variable_incomplete(self, completion):
+        """When the variable name is completed, we should not
+        immediately suffix the equal sign.  The equal sign will be
+        appended on a further TAB after the word becomes a complete
+        variable name.
+        """
+        assert completion
+        assert "=" not in "".join(completion)
+        assert not completion.endswith(" ")
+
+    @pytest.mark.complete("export BASH")
+    def test_no_equals_sign_for_variable_ambiguous(self, completion):
+        """When the completion is not unique, we should not suffix the
+        equal sign.
+        """
+        assert completion
+        assert "=" not in "".join(completion)
+        assert not completion.endswith(" ")
+
+    @pytest.mark.complete("export BASH_VERSION")
+    def test_no_equals_sign_for_variable_complete(self, completion):
+        """Only when the current word is already complete and matches
+        unique completion, we should suffix the equal sign.
+        """
+        assert completion
+        assert "=" in "".join(completion)
+
     @pytest.fixture(scope="class")
     def export_f_canary(self, request, bash):
         assert_bash_exec(bash, "_comp__test_export_f_canary() { return; }")
 
     @pytest.mark.complete("export -f _comp__test_export_f_canar")
-    def test_no_equals_sign_for_function(self, completion, export_f_canary):
+    def test_no_equals_sign_for_function_incomplete(
+        self, completion, export_f_canary
+    ):
         assert completion
         assert "=" not in "".join(completion)
         assert completion.endswith(" ")
 
+    @pytest.mark.complete("export -f _comp__test_export_f_canary")
+    def test_no_equals_sign_for_function_complete(
+        self, completion, export_f_canary
+    ):
+        """We can suffix a space to a function name because there is
+        no possibility that the equal sign is suffixed to a function
+        name."""
+        assert completion.output == " "
+
     @pytest.mark.complete("export -f -")
     def test_second_option(self, completion):
         assert completion