Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixe arg parsing when one-character argument is followed by ; #13706

Merged
2 commits merged into from
Aug 12, 2022
Merged

Fixe arg parsing when one-character argument is followed by ; #13706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b154e3
seems to work
serd2011 Aug 9, 2022
8bc658c
added a test
serd2011 Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,21 @@ namespace TerminalAppLocalTests
VERIFY_ARE_EQUAL("wt.exe", commandlines.at(3).Args().at(0));
VERIFY_ARE_EQUAL("baz", commandlines.at(3).Args().at(1));
}
{
std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-p", L"u;", L"nt", L"-p", L"u" };

auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
VERIFY_ARE_EQUAL(2u, commandlines.size());
VERIFY_ARE_EQUAL(3u, commandlines.at(0).Argc());
VERIFY_ARE_EQUAL("wt.exe", commandlines.at(0).Args().at(0));
VERIFY_ARE_EQUAL("-p", commandlines.at(0).Args().at(1));
VERIFY_ARE_EQUAL("u", commandlines.at(0).Args().at(2));
VERIFY_ARE_EQUAL(4u, commandlines.at(1).Argc());
VERIFY_ARE_EQUAL("wt.exe", commandlines.at(1).Args().at(0));
VERIFY_ARE_EQUAL("nt", commandlines.at(1).Args().at(1));
VERIFY_ARE_EQUAL("-p", commandlines.at(1).Args().at(2));
VERIFY_ARE_EQUAL("u", commandlines.at(1).Args().at(3));
}
}

void CommandlineTest::TestEscapeDelimiters()
Expand Down
6 changes: 5 additions & 1 deletion src/cascadia/TerminalApp/AppCommandlineArgs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,11 @@ void AppCommandlineArgs::_addCommandsForArg(std::vector<Commandline>& commands,
else
{
// Harder case: There was a match.
const auto matchedFirstChar = match.position(0) == 0;

// Regex will include the last character of the string before the delimiter. (see _commandDelimiterRegex)
// If the match was at the beginning of the string then there is no last character
// so we can use the length of the match to determine if it was at the beginning.
const auto matchedFirstChar = match[0].length() == 1;
// If the match was at the beginning of the string, then the
// next arg should be "", since there was no content before the
// delimiter. Otherwise, add one, since the regex will include
Expand Down