RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 15:18:11 +00:00
Code Issues Activity Actions

Shell: Correctly complete paths in redirections

Browse source 
This commit allows the Shell to complete paths in redirections.
A closing quote is added if the path is an unclosed quote.
```
$ foo > "foob<tab>
$ foo > "foobar"
```
This commit is contained in:
AnotherTest 2020-05-29 18:58:35 +04:30 • committed by Andreas Kling
parent 9a4ee9aa1a
commit 77039e5354
3 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Shell/Parser.cpp
View file

@ -33,12 +33,13 @@ void Parser::commit_token(Token::Type type, AllowEmptyToken allow_empty)
{
if (allow_empty == AllowEmptyToken::No && m_token.is_empty())
return;
Token token { String::copy(m_token), m_position, m_token.size(), type };
if (state() == InRedirectionPath) {
m_redirections.last().path = String::copy(m_token);
m_redirections.last().path = move(token);
m_token.clear_with_capacity();
return;
}
m_tokens.append({ String::copy(m_token), m_position, m_token.size(), type });
m_tokens.append(token);
m_token.clear_with_capacity();
};
@ -333,13 +334,15 @@ Vector<Command> Parser::parse()
while (m_state_stack.size() > 1) {
if (state() == State::InDoubleQuotes) {
pop_state();
commit_token(Token::UnterminatedDoubleQuoted, AllowEmptyToken::Yes);
} else if (state() == State::InSingleQuotes) {
pop_state();
commit_token(Token::UnterminatedSingleQuoted, AllowEmptyToken::Yes);
} else {
commit_token(Token::Bare, AllowEmptyToken::No);
pop_state();
}
pop_state();
}
ASSERT(state() == State::Free);