diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp index 33f7983011..fdcaa68e9b 100644 --- a/Userland/Shell/Shell.cpp +++ b/Userland/Shell/Shell.cpp @@ -1409,8 +1409,12 @@ void Shell::highlight(Line::Editor& editor) const Vector Shell::complete() { - auto line = m_editor->line(m_editor->cursor()); + m_completion_stack_info = {}; + return complete(m_editor->line(m_editor->cursor())); +} +Vector Shell::complete(StringView line) +{ Parser parser(line, m_is_interactive); auto ast = parser.parse(); @@ -1850,29 +1854,53 @@ ErrorOr> Shell::complete_via_program_itself(s { "/", "rx" }, }, }); - execute_node->for_each_entry(*this, [&](NonnullRefPtr entry) -> IterationDecision { - auto result = entry->resolve_as_string(*this); - JsonParser parser(result); - auto parsed_result = parser.parse(); - if (parsed_result.is_error()) - return IterationDecision::Continue; - auto parsed = parsed_result.release_value(); - if (parsed.is_object()) { - auto& object = parsed.as_object(); - Line::CompletionSuggestion suggestion { - object.get("completion").as_string_or(""), - object.get("trailing_trivia").as_string_or(""), - object.get("display_trivia").as_string_or(""), - }; - suggestion.static_offset = object.get("static_offset").to_u64(0); - suggestion.invariant_offset = object.get("invariant_offset").to_u64(0); - suggestions.append(move(suggestion)); - } else { - suggestions.append(parsed.to_string()); - } + { + TemporaryChange change(m_is_interactive, false); + execute_node->for_each_entry(*this, [&](NonnullRefPtr entry) -> IterationDecision { + auto result = entry->resolve_as_string(*this); + JsonParser parser(result); + auto parsed_result = parser.parse(); + if (parsed_result.is_error()) + return IterationDecision::Continue; + auto parsed = parsed_result.release_value(); + if (parsed.is_object()) { + auto& object = parsed.as_object(); + auto kind = object.get("kind").as_string_or("plain"); + if (kind == "path") { + auto base = object.get("base").as_string_or(""); + auto part = object.get("part").as_string_or(""); + auto executable_only = object.get("executable_only").to_bool(false) ? ExecutableOnly::Yes : ExecutableOnly::No; + suggestions.extend(complete_path(base, part, part.length(), executable_only, nullptr, nullptr)); + } else if (kind == "program") { + auto name = object.get("name").as_string_or(""); + suggestions.extend(complete_program_name(name, name.length())); + } else if (kind == "proxy") { + if (m_completion_stack_info.size_free() < 4 * KiB) { + dbgln("Not enough stack space, recursion?"); + return IterationDecision::Continue; + } + auto argv = object.get("argv").as_string_or(""); + dbgln("Proxy completion for {}", argv); + suggestions.extend(complete(argv)); + } else if (kind == "plain") { + Line::CompletionSuggestion suggestion { + object.get("completion").as_string_or(""), + object.get("trailing_trivia").as_string_or(""), + object.get("display_trivia").as_string_or(""), + }; + suggestion.static_offset = object.get("static_offset").to_u64(0); + suggestion.invariant_offset = object.get("invariant_offset").to_u64(0); + suggestions.append(move(suggestion)); + } else { + dbgln("LibLine: Unhandled completion kind: {}", kind); + } + } else { + suggestions.append(parsed.to_string()); + } - return IterationDecision::Continue; - }); + return IterationDecision::Continue; + }); + } auto pgid = getpgrp(); tcsetpgrp(STDOUT_FILENO, pgid); diff --git a/Userland/Shell/Shell.h b/Userland/Shell/Shell.h index 322043c400..e26ed5ae9e 100644 --- a/Userland/Shell/Shell.h +++ b/Userland/Shell/Shell.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -223,6 +224,7 @@ public: void highlight(Line::Editor&) const; Vector complete(); + Vector complete(StringView); Vector complete_program_name(StringView, size_t offset, EscapeMode = EscapeMode::Bareword); Vector complete_variable(StringView, size_t offset); Vector complete_user(StringView, size_t offset); @@ -419,6 +421,8 @@ private: mutable bool m_last_continuation_state { false }; // false == not needed. Optional m_history_autosave_time; + + StackInfo m_completion_stack_info; }; [[maybe_unused]] static constexpr bool is_word_character(char c)