Merge pull request #6243 from epage/term

fix(parser): Resolve regression with value_terminator/last

Author: epage

clap_builder/src/parser/parser.rs

@@ -132,12 +132,14 @@ impl<'cmd> Parser<'cmd> {
                         self.cmd[opt].is_allow_hyphen_values_set())
                     {
                         // ParseResult::MaybeHyphenValue, do nothing
-                    } else if self.cmd.get_keymap().get(&pos_counter).is_some_and(|arg| {
-                        self.check_terminator(arg, arg_os.to_value_os()).is_some()
-                    }) {
-                        // Value terminator for this positional, let positional parsing handle it.
                     } else {
                         debug!("Parser::get_matches_with: setting TrailingVals=true");
+                        if self.cmd.get_keymap().get(&pos_counter).is_some_and(|arg| {
+                            self.check_terminator(arg, arg_os.to_value_os()).is_some()
+                        }) {
+                            // count as both an escape and terminator
+                            pos_counter += 1;
+                        }
                         trailing_values = true;
                         matcher.start_trailing();
                         continue;