argcomplete 3.6.0__tar.gz → 3.6.2__tar.gz

{argcomplete-3.6.0 → argcomplete-3.6.2}/Changes.rst

@@ -1,3 +1,21 @@
+Changes for v3.6.2 (2025-04-02)
+===============================
+
+- Revert “zsh: skip repeat Python runs in the same completion run” This
+  reverts a regression introduced in zsh tab completion configurations
+  utilizing multiple matchers.
+
+Changes for v3.6.1 (2025-03-22)
+===============================
+
+- zsh: add global completion system install dir to user fpath if not
+  present
+
+- Update shell_integration.py to support spaces in script file path.
+  (#525)
+
+- Fix completion when wordbreak is first character (#526)
+
 Changes for v3.6.0 (2025-03-05)
 ===============================
 

{argcomplete-3.6.0 → argcomplete-3.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argcomplete
-Version: 3.6.0
+Version: 3.6.2
 Summary: Bash tab completion for argparse
 Project-URL: Homepage, https://github.com/kislyuk/argcomplete
 Project-URL: Documentation, https://kislyuk.github.io/argcomplete

{argcomplete-3.6.0 → argcomplete-3.6.2}/argcomplete/bash_completion.d/_python-argcomplete

@@ -124,12 +124,6 @@ __python_argcomplete_which() {
 _python_argcomplete_global() {
 
     if [[ -n "${ZSH_VERSION-}" ]]; then
-        if [[ "${_matcher_num-}" -gt 1 ]]; then
-            # Return early if the completer is called multiple times in the same completion run.
-            # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared.
-            # When this happens, _matcher_num is incremented past 1.
-            return
-        fi
         # Store result of a regex match in the
         # BASH_REMATCH variable rather than MATCH
         setopt local_options BASH_REMATCH

{argcomplete-3.6.0 → argcomplete-3.6.2}/argcomplete/finders.py

@@ -515,7 +515,7 @@ class CompletionFinder(object):
             # Bash mangles completions which contain characters in COMP_WORDBREAKS.
             # This workaround has the same effect as __ltrim_colon_completions in bash_completion
             # (extended to characters other than the colon).
-            if last_wordbreak_pos:
+            if last_wordbreak_pos is not None:
                 completions = [c[last_wordbreak_pos + 1 :] for c in completions]
             special_chars += "();<>|&!`$* \t\n\"'"
         elif cword_prequote == '"':

{argcomplete-3.6.0 → argcomplete-3.6.2}/argcomplete/packages/_shlex.py

@@ -177,6 +177,9 @@ class shlex:
                 elif self.whitespace_split:
                     self.token = nextchar
                     self.state = 'a'
+                    # Modified by argcomplete: Record last wordbreak position
+                    if nextchar in self.wordbreaks:
+                        self.last_wordbreak_pos = len(self.token) - 1
                 else:
                     self.token = nextchar
                     if self.token or (self.posix and quoted):

{argcomplete-3.6.0 → argcomplete-3.6.2}/argcomplete/scripts/activate_global_python_argcomplete.py

@@ -122,15 +122,36 @@ def append_to_config_file(path, shellcode):
     print("Added.", file=sys.stderr)
 
 
-def link_user_rcfiles():
-    # TODO: warn if running as superuser
+def link_zsh_user_rcfile(zsh_fpath=None):
     zsh_rcfile = os.path.join(os.path.expanduser(os.environ.get("ZDOTDIR", "~")), ".zshenv")
-    append_to_config_file(zsh_rcfile, zsh_shellcode.format(zsh_fpath=get_activator_dir()))
+    append_to_config_file(zsh_rcfile, zsh_shellcode.format(zsh_fpath=zsh_fpath or get_activator_dir()))
 
+
+def link_bash_user_rcfile():
     bash_completion_user_file = os.path.expanduser("~/.bash_completion")
     append_to_config_file(bash_completion_user_file, bash_shellcode.format(activator=get_activator_path()))
 
 
+def link_user_rcfiles():
+    # TODO: warn if running as superuser
+    link_zsh_user_rcfile()
+    link_bash_user_rcfile()
+
+
+def add_zsh_system_dir_to_fpath_for_user():
+    if "zsh" not in os.environ.get("SHELL", ""):
+        return
+    try:
+        zsh_system_dir = get_zsh_system_dir()
+        fpath_output = subprocess.check_output([os.environ["SHELL"], "-c", 'printf "%s\n" "${fpath[@]}"'])
+        for fpath in fpath_output.decode().splitlines():
+            if fpath == zsh_system_dir:
+                return
+        link_zsh_user_rcfile(zsh_fpath=zsh_system_dir)
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        pass
+
+
 def main():
     global args
     args = parser.parse_args()
@@ -160,6 +181,8 @@ def main():
     for destination in destinations:
         install_to_destination(destination)
 
+    add_zsh_system_dir_to_fpath_for_user()
+
     if args.dest is None:
         print("Please restart your shell or source the installed file to activate it.", file=sys.stderr)
 

{argcomplete-3.6.0 → argcomplete-3.6.2}/argcomplete/shell_integration.py

@@ -34,12 +34,6 @@ _python_argcomplete%(function_suffix)s() {
     local IFS=$'\013'
     local script="%(argcomplete_script)s"
     if [[ -n "${ZSH_VERSION-}" ]]; then
-        if [[ "${_matcher_num-}" -gt 1 ]]; then
-            # Return early if the completer is called multiple times in the same completion run.
-            # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared.
-            # When this happens, _matcher_num is incremented past 1.
-            return
-        fi
         local completions
         completions=($(IFS="$IFS" \
             COMP_LINE="$BUFFER" \
@@ -166,7 +160,8 @@ def shellcode(executables, use_defaults=True, shell="bash", complete_arguments=N
         executables_list = " ".join(quoted_executables)
         script = argcomplete_script
         if script:
-            function_suffix = "_" + script
+            # If the script path contain a space, this would generate an invalid function name.
+            function_suffix = "_" + script.replace(" ", "_SPACE_")
         else:
             script = ""
             function_suffix = ""

{argcomplete-3.6.0 → argcomplete-3.6.2}/docs/conf.py

@@ -21,7 +21,7 @@ autodoc_member_order = "bysource"
 autodoc_typehints = "description"
 autodoc_typehints_description_target = "documented_params"
 intersphinx_mapping = {
-    "https://docs.python.org/3": None,
+    "python": ("https://docs.python.org/3", None),
 }
 templates_path = [""]
 ogp_site_url = "https://kislyuk.github.io/" + project

{argcomplete-3.6.0 → argcomplete-3.6.2}/test/test.py

@@ -1041,10 +1041,12 @@ class TestSplitLine(unittest.TestCase):
 
     def test_last_wordbreak_pos(self):
         self.assertEqual(self.wordbreak("a"), None)
+        self.assertEqual(self.wordbreak("a :b"), 0)
         self.assertEqual(self.wordbreak("a b:c"), 1)
         self.assertEqual(self.wordbreak("a b:c=d"), 3)
         self.assertEqual(self.wordbreak("a b:c=d "), None)
         self.assertEqual(self.wordbreak("a b:c=d e"), None)
+        self.assertEqual(self.wordbreak('":b'), None)
         self.assertEqual(self.wordbreak('"b:c'), None)
         self.assertEqual(self.wordbreak('"b:c=d'), None)
         self.assertEqual(self.wordbreak('"b:c=d"'), None)