fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-02-24 00:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shell: Don't crash when autocompleting a non-bare word

Browse Source 
For example, type 'Hello?' without the quotation marks but with the
question mark, and press TAB.

Previously, this would crash the Shell. Now, it merely refuses
to make any suggestions.

We could do better, but that is too hard for now.
This commit is contained in:
Ben Wiederhake
2020-07-25 07:59:30 +02:00
committed by Andreas Kling
parent 4ad6315fda
commit 782db88e82
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Shell/AST.cpp
View File

@@ -441,10 +441,9 @@ HitTestResult CastToCommand::hit_test_position(size_t offset)
Vector<Line::CompletionSuggestion> CastToCommand::complete_for_editor(Shell& shell, size_t offset, const HitTestResult& hit_test_result)
{
auto matching_node = hit_test_result.matching_node;
if (!matching_node)
if (!matching_node || !matching_node->is_bareword())
return {};
ASSERT(matching_node->is_bareword());
auto corrected_offset = offset - matching_node->position().start_offset;
auto* node = static_cast<BarewordLiteral*>(matching_node.ptr());
@@ -953,10 +952,9 @@ HitTestResult Execute::hit_test_position(size_t offset)
Vector<Line::CompletionSuggestion> Execute::complete_for_editor(Shell& shell, size_t offset, const HitTestResult& hit_test_result)
{
auto matching_node = hit_test_result.matching_node;
if (!matching_node)
if (!matching_node || !matching_node->is_bareword())
return {};
ASSERT(matching_node->is_bareword());
auto corrected_offset = offset - matching_node->position().start_offset;
auto* node = static_cast<BarewordLiteral*>(matching_node.ptr());
@@ -1204,10 +1202,9 @@ HitTestResult PathRedirectionNode::hit_test_position(size_t offset)
Vector<Line::CompletionSuggestion> PathRedirectionNode::complete_for_editor(Shell& shell, size_t offset, const HitTestResult& hit_test_result)
{
auto matching_node = hit_test_result.matching_node;
if (!matching_node)
if (!matching_node || !matching_node->is_bareword())
return {};
ASSERT(matching_node->is_bareword());
auto corrected_offset = offset - matching_node->position().start_offset;
auto* node = static_cast<BarewordLiteral*>(matching_node.ptr());