Prioritise contextual keywords over other autocomplete entries

Author: JohnnyMorganz

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Sync to upstream Luau 0.698
 - Table properties are now prioritised above other autocomplete entries (again, fixing a dormant bug)
+- Contextual keywords (`else` / `elseif` / `end`) are prioritised over other autocomplete entries when inside of the relevant statement
 
 ### Fixed
 

src/operations/Completion.cpp

@@ -325,7 +325,12 @@ static const char* sortText(const Luau::Frontend& frontend, const std::string& n
     else if (entry.kind == Luau::AutocompleteEntryKind::Property)
         return SortText::TableProperties;
     else if (entry.kind == Luau::AutocompleteEntryKind::Keyword)
+    {
+        // These keywords are contextual and only show up when relevant - they should be prioritised over other suggestions
+        if (name == "else" || name == "elseif" || name == "until" || name == "end")
+            return SortText::PrioritisedSuggestion;
         return SortText::Keywords;
+    }
     else if (entry.typeCorrect == Luau::TypeCorrectKind::Correct)
         return SortText::CorrectTypeKind;
     else if (entry.typeCorrect == Luau::TypeCorrectKind::CorrectFunctionResult)

tests/Autocomplete.test.cpp

@@ -1804,4 +1804,29 @@ TEST_CASE_FIXTURE(Fixture, "prioritise_properties_when_sorting_autocomplete_in_t
     }
 }
 
+TEST_CASE_FIXTURE(Fixture, "prioritise_relevant_keywords_when_inside_of_if")
+{
+    ScopedFastFlag sff{FFlag::LuauSolverV2, true};
+
+    auto [source, marker] = sourceWithMarker(R"(
+        if true then
+            |
+    )");
+
+    auto uri = newDocument("foo.luau", source);
+
+    lsp::CompletionParams params;
+    params.textDocument = lsp::TextDocumentIdentifier{uri};
+    params.position = marker;
+
+    auto result = workspace.completion(params, nullptr);
+
+    for (const auto property : {"else", "elseif", "end"})
+    {
+        auto entry = getItem(result, property);
+        REQUIRE(entry);
+        CHECK_EQ(entry->sortText, SortText::PrioritisedSuggestion);
+    }
+}
+
 TEST_SUITE_END();