From d4eef0f17d553e9a46eda99a85992c61eb3dba18 Mon Sep 17 00:00:00 2001 From: thislooksfun Date: Wed, 27 Oct 2021 19:45:34 -0500 Subject: [PATCH] LibGUI: Abstract out and name repeated logic --- Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp b/Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp index de05c2bb77..2c04721376 100644 --- a/Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp +++ b/Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp @@ -155,9 +155,10 @@ void GMLAutocompleteProvider::provide_completions(Function)> identifier_entries.empend("layout: ", partial_input_length, Language::Unspecified, "layout"); }; + bool after_token_on_same_line = last_seen_token && last_seen_token->m_end.column != cursor.column() && last_seen_token->m_end.line == cursor.line(); switch (state) { case Free: - if (last_seen_token && last_seen_token->m_end.column != cursor.column() && last_seen_token->m_end.line == cursor.line()) { + if (after_token_on_same_line) { // After some token, but with extra space, not on a new line. // Nothing to put here. break; @@ -168,7 +169,7 @@ void GMLAutocompleteProvider::provide_completions(Function)> case InClassName: { if (class_names.is_empty()) break; - if (last_seen_token && last_seen_token->m_end.column != cursor.column() && last_seen_token->m_end.line == cursor.line()) { + if (after_token_on_same_line) { // After a class name, but haven't seen braces. // TODO: Suggest braces? break; @@ -184,7 +185,7 @@ void GMLAutocompleteProvider::provide_completions(Function)> break; } case InIdentifier: { - if (last_seen_token && last_seen_token->m_end.column != cursor.column() && last_seen_token->m_end.line == cursor.line()) { + if (after_token_on_same_line) { // After an identifier, but with extra space // TODO: Maybe suggest a colon? break;