Prioritise table properties over other autocomplete entries

Author: JohnnyMorganz

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - Sync to upstream Luau 0.698
+- Table properties are now prioritised above other autocomplete entries (again, fixing a dormant bug)
 
 ### Fixed
 

src/operations/Completion.cpp

@@ -320,16 +320,16 @@ static const char* sortText(const Luau::Frontend& frontend, const std::string& n
 
     if (entry.wrongIndexType)
         return SortText::WrongIndexType;
-    if (entry.typeCorrect == Luau::TypeCorrectKind::Correct)
-        return SortText::CorrectTypeKind;
-    else if (entry.typeCorrect == Luau::TypeCorrectKind::CorrectFunctionResult)
-        return SortText::CorrectFunctionResult;
     else if (entry.kind == Luau::AutocompleteEntryKind::Property && types::isMetamethod(name))
         return SortText::MetatableIndex;
     else if (entry.kind == Luau::AutocompleteEntryKind::Property)
         return SortText::TableProperties;
     else if (entry.kind == Luau::AutocompleteEntryKind::Keyword)
         return SortText::Keywords;
+    else if (entry.typeCorrect == Luau::TypeCorrectKind::Correct)
+        return SortText::CorrectTypeKind;
+    else if (entry.typeCorrect == Luau::TypeCorrectKind::CorrectFunctionResult)
+        return SortText::CorrectFunctionResult;
 
     return SortText::Default;
 }

tests/Autocomplete.test.cpp

@@ -4,6 +4,7 @@
 #include "ScopedFlags.h"
 #include "Platform/RobloxPlatform.hpp"
 #include "LSP/IostreamHelpers.hpp"
+#include "LSP/Completion.hpp"
 
 std::optional<lsp::CompletionItem> getItem(const std::vector<lsp::CompletionItem>& items, const std::string& label)
 {
@@ -1769,4 +1770,38 @@ TEST_CASE_FIXTURE(Fixture, "autocomplete_label_does_not_show_hidden_variadics")
     CHECK_EQ(func->labelDetails->detail, "(path)");
 }
 
+TEST_CASE_FIXTURE(Fixture, "prioritise_properties_when_sorting_autocomplete_in_table")
+{
+    ScopedFastFlag sff{FFlag::LuauSolverV2, true};
+
+    auto [source, marker] = sourceWithMarker(R"(
+        type Options = {
+            name: string,
+            description: string,
+            label: string
+        }
+        local function create(options: Options)
+        end
+
+        create({
+            |
+        })
+    )");
+
+    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 : {"name", "description", "label"})
+    {
+        auto entry = getItem(result, property);
+        REQUIRE(entry);
+        CHECK_EQ(entry->sortText, SortText::TableProperties);
+    }
+}
+
 TEST_SUITE_END();