浏览代码

LibGUI: Abstract out and name repeated logic

thislooksfun 3 年之前
父节点
当前提交
d4eef0f17d
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp

+ 4 - 3
Userland/Libraries/LibGUI/GMLAutocompleteProvider.cpp

@@ -155,9 +155,10 @@ void GMLAutocompleteProvider::provide_completions(Function<void(Vector<Entry>)>
             identifier_entries.empend("layout: ", partial_input_length, Language::Unspecified, "layout");
             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) {
     switch (state) {
     case Free:
     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.
             // After some token, but with extra space, not on a new line.
             // Nothing to put here.
             // Nothing to put here.
             break;
             break;
@@ -168,7 +169,7 @@ void GMLAutocompleteProvider::provide_completions(Function<void(Vector<Entry>)>
     case InClassName: {
     case InClassName: {
         if (class_names.is_empty())
         if (class_names.is_empty())
             break;
             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.
             // After a class name, but haven't seen braces.
             // TODO: Suggest braces?
             // TODO: Suggest braces?
             break;
             break;
@@ -184,7 +185,7 @@ void GMLAutocompleteProvider::provide_completions(Function<void(Vector<Entry>)>
         break;
         break;
     }
     }
     case InIdentifier: {
     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
             // After an identifier, but with extra space
             // TODO: Maybe suggest a colon?
             // TODO: Maybe suggest a colon?
             break;
             break;