open/voyage
1
0
Fork 0
Code Issues Releases 13 Activity

fix(arg-parser): a quoted value closes at a quote that ends a word, also after whitespace

Browse source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Kjell Tore Guttormsen 2026-10-28 22:34:38 +01:00
commit 8c52c3c32e
Signed by: ktg
SSH key fingerprint: SHA256:JakMjO6FTBBzN0Bhfj9saOoEjaFxlSdYuZQQpM/lF9Q
2 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/parsers/arg-parser.mjs
View file

@ -137,15 +137,16 @@ const isSpace = (c) => /\s/.test(c);
* Split argument text into words. Words are separated by whitespace. A word
* that starts with `'` or `"` opens a quote. Its closing quote is the next
* same-kind quote that ends a word (followed by whitespace or the end of the
* text) and does not start one; a same-kind quote inside a word is skipped.
* The search stops at a same-kind quote that starts a word (one preceded by
* whitespace): then there is no pair. A pair groups the words between the
* quotes into one value and is removed. A quote with no partner is a literal
* character (`user's` stays `user's`). Examples: `'Fix the user's login'` is
* one value, `Fix the user's login`; `"my dir"/x --since "HEAD~1"` gives the
* literal words `"my` and `dir"/x`, then `--since` and `HEAD~1`, so a quoted
* value never swallows a later flag. Nothing is expanded: the function only
* slices the string.
* text), whatever stands before it: a letter, whitespace or a line break. A
* same-kind quote that starts a word (whitespace before it, a non-whitespace
* character after it) stops the search: then there is no pair. Any other
* same-kind quote (inside a word) is skipped. A pair groups the words between
* the quotes into one value and is removed. A quote with no partner is a
* literal character (`user's` stays `user's`). Examples: `"my dir "` is one
* value, `my dir `; `'Fix the user's login'` is one value,
* `Fix the user's login`; `"my dir"/x --since "HEAD~1"` gives the literal
* words `"my` and `dir"/x`, then `--since` and `HEAD~1`. Nothing is expanded:
* the function only slices the string.
*
* @param {string} text
* @returns {Array<{ value: string, start: number, end: number }>}
@ -163,8 +164,11 @@ export function tokenize(text) {
const q = text[i];
if (q === '"' || q === "'") {
let j = text.indexOf(q, i + 1);
while (j !== -1 && !isSpace(text[j - 1]) && j + 1 < n && !isSpace(text[j + 1])) j = text.indexOf(q, j + 1);
if (j !== -1 && !isSpace(text[j - 1])) {
while (j !== -1 && j + 1 < n && !isSpace(text[j + 1])) {
if (isSpace(text[j - 1])) { j = -1; break; }
j = text.indexOf(q, j + 1);
}
if (j !== -1) {
out.push({ value: text.slice(i + 1, j), start, end: j + 1 });
i = j + 1;
continue;