feat(env): treat -* as the command name after assignments

completions/env

@@ -7,10 +7,16 @@ _comp_cmd_env()
 
     local i noargopts='!(-*|*[uCS]*)'
     for ((i = 1; i <= cword; i++)); do
-        if [[ ${words[i]} != -* && ${words[i]} != *=* ]]; then
-            _comp_command_offset $i
-            return
+        if [[ ${words[i]} != -* ]]; then
+            for (( ; i <= cword; i++)); do
+                if [[ ${words[i]} != *=* ]]; then
+                    _comp_command_offset "$i"
+                    return
+                fi
+            done
+            break
         fi
+
         # shellcheck disable=SC2254
         [[ ${words[i]} == @(--@(unset|chdir|split-string)|-${noargopts}[uCS]) ]] &&
             ((i++))

test/t/test_env.py

@@ -22,10 +22,13 @@ def test_lang_envvar(self, completion):
             "",
             "foo=bar",
             "--debug",
-            "foo=bar --debug",
             "--debug foo=bar",
         ],
     )
     def test_command(self, bash, opts):
         completion = assert_complete(bash, "env %s s" % opts)
         assert completion == "h" or "sh" in completion
+
+    @pytest.mark.complete("env foo=bar --debug s")
+    def test_option_like_command_after_assignment(self, completion):
+        assert not (completion == "h" or "sh" in completion)