RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 20:25:07 +00:00
Code Issues Activity Actions

Shell: Fix completing barewords with escapes

Browse source 
e.g. completing `foo\ bar` now works as expected.
This commit is contained in:
AnotherTest 2021-01-09 03:32:19 +03:30 • committed by Andreas Kling
parent 7059ca9b15
commit 9523bcbfe1
3 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Shell/Shell.cpp
View file

@ -1114,30 +1114,35 @@ String Shell::escape_token_for_single_quotes(const String& token)
return builder.build();
}
bool Shell::is_special(char c)
{
switch (c) {
case '\'':
case '"':
case '$':
case '|':
case '>':
case '<':
case '(':
case ')':
case '{':
case '}':
case '&':
case '\\':
case ' ':
return true;
default:
return false;
}
}
String Shell::escape_token(const String& token)
{
StringBuilder builder;
for (auto c : token) {
switch (c) {
case '\'':
case '"':
case '$':
case '|':
case '>':
case '<':
case '(':
case ')':
case '{':
case '}':
case '&':
case '\\':
case ' ':
if (is_special(c))
builder.append('\\');
break;
default:
break;
}
builder.append(c);
}
@ -1256,7 +1261,6 @@ Vector<Line::CompletionSuggestion> Shell::complete()
Vector<Line::CompletionSuggestion> Shell::complete_path(const String& base, const String& part, size_t offset)
{
auto token = offset ? part.substring_view(0, offset) : "";
StringView original_token = token;
String path;
ssize_t last_slash = token.length() - 1;
@ -1294,7 +1298,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_path(const String& base, cons
// `/foo/', but rather just `bar...'
auto token_length = escape_token(token).length();
if (m_editor)
m_editor->suggest(token_length, original_token.length() - token_length);
m_editor->suggest(token_length, last_slash + 1);
// only suggest dot-files if path starts with a dot
Core::DirIterator files(path,