beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Shell: Highlight redirections

Browse source
This commit is contained in:
AnotherTest 2020-06-08 11:38:37 +04:30 committed by Andreas Kling
parent 07c070745f
commit 2714bba3f0
Notes: sideshowbarker 2024-07-19 05:45:40 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/2714bba3f00
Pull-request: https://github.com/SerenityOS/serenity/pull/2528
Reviewed-by: https://github.com/awesomekling
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Shell/Parser.cpp
View file

@ -147,6 +147,8 @@ Vector<Command> Parser::parse()
if (ch == '>') {
commit_token(Token::Special);
begin_redirect_write(STDOUT_FILENO);
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
// Search for another > for append.
push_state(State::InWriteAppendOrRedirectionPath);
@ -155,6 +157,8 @@ Vector<Command> Parser::parse()
if (ch == '<') {
commit_token(Token::Special);
begin_redirect_read(STDIN_FILENO);
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
push_state(State::InRedirectionPath);
break;
}
@ -208,11 +212,15 @@ Vector<Command> Parser::parse()
if (m_input.characters()[redir_end] == '>') {
begin_redirect_write(fd);
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
// Search for another > for append.
push_state(State::InWriteAppendOrRedirectionPath);
}
if (m_input.characters()[redir_end] == '<') {
begin_redirect_read(fd);
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
push_state(State::InRedirectionPath);
}
@ -227,6 +235,8 @@ Vector<Command> Parser::parse()
if (next_ch == '>') {
commit_token(Token::Special);
begin_redirect_write(ch - '0');
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
++i;
// Search for another > for append.
@ -236,6 +246,8 @@ Vector<Command> Parser::parse()
if (next_ch == '<') {
commit_token(Token::Special);
begin_redirect_read(ch - '0');
ASSERT(!m_redirections.is_empty());
m_redirections.last().redirection_op_start = m_position;
++i;
push_state(State::InRedirectionPath);
@ -251,7 +263,7 @@ Vector<Command> Parser::parse()
pop_state();
push_state(State::InRedirectionPath);
ASSERT(m_redirections.size());
m_redirections[m_redirections.size() - 1].type = Redirection::FileWriteAppend;
m_redirections.last().type = Redirection::FileWriteAppend;
break;
}
@ -263,15 +275,11 @@ Vector<Command> Parser::parse()
if (ch == '<') {
commit_token(Token::Special);
begin_redirect_read(STDIN_FILENO);
pop_state();
push_state(State::InRedirectionPath);
break;
}
if (ch == '>') {
commit_token(Token::Special);
begin_redirect_read(STDOUT_FILENO);
pop_state();
push_state(State::InRedirectionPath);
break;
}
if (ch == '|') {
@ -292,8 +300,20 @@ Vector<Command> Parser::parse()
push_state(State::InSingleQuotes);
break;
}
if (ch == ' ')
if (ch == ' ') {
if (m_token.is_empty()) {
// foo > bar
// ^ We are at this space, we want to ignore it but not leave the state.
break;
}
commit_token(Token::Special);
if (m_tokens.is_empty()) {
fprintf(stderr, "Syntax error: Redirection without a path\n");
return {};
}
pop_state();
break;
}
m_token.append(ch);
break;
case State::InSingleQuotes:

1
Shell/Parser.h
View file

@ -61,6 +61,7 @@ struct Redirection {
Type type;
int fd { -1 };
int rewire_fd { -1 };
size_t redirection_op_start { 0 };
Token path {};
};

19
Shell/Shell.cpp
View file

@ -1482,17 +1482,36 @@ void Shell::cache_path()
void Shell::highlight(Line::Editor& editor) const
{
StringBuilder builder;
bool is_offset_by_string_start = false;
if (m_should_continue == ExitCodeOrContinuationRequest::DoubleQuotedString) {
builder.append('"');
is_offset_by_string_start = true;
}
if (m_should_continue == ExitCodeOrContinuationRequest::SingleQuotedString) {
builder.append('\'');
is_offset_by_string_start = true;
}
builder.append(editor.line());
auto commands = Parser { builder.string_view() }.parse();
auto first_command { true };
for (auto& command : commands) {
for (auto& subcommand : command.subcommands) {
auto& redirections = subcommand.redirections;
for (auto& redirection : redirections) {
if (redirection.type == Redirection::Pipe)
continue;
if (redirection.path.length == 0)
continue;
Line::Style redirection_style { Line::Style::Foreground(0x87, 0x9b, 0xcd) }; // 25% darkened periwinkle :)
auto end = redirection.path.end;
auto redirection_op_start = redirection.redirection_op_start;
if (is_offset_by_string_start) {
end--;
redirection_op_start--;
}
editor.stylize({ redirection_op_start, end }, redirection_style);
}
auto first { true };
for (auto& arg : subcommand.args) {
auto start = arg.end - arg.length;