mirror of
https://github.com/luau-lang/luau.git
synced 2024-11-15 14:25:44 +08:00
Handle autocomplete in table when no initial character present (#1155)
Closes #685
This commit is contained in:
parent
9c588be16d
commit
c0b17daebd
@ -16,6 +16,7 @@
|
|||||||
LUAU_FASTFLAG(DebugLuauDeferredConstraintResolution);
|
LUAU_FASTFLAG(DebugLuauDeferredConstraintResolution);
|
||||||
LUAU_FASTFLAG(DebugLuauReadWriteProperties);
|
LUAU_FASTFLAG(DebugLuauReadWriteProperties);
|
||||||
LUAU_FASTFLAGVARIABLE(LuauAutocompleteStringLiteralBounds, false);
|
LUAU_FASTFLAGVARIABLE(LuauAutocompleteStringLiteralBounds, false);
|
||||||
|
LUAU_FASTFLAGVARIABLE(LuauAutocompleteTableKeysNoInitialCharacter, false);
|
||||||
|
|
||||||
static const std::unordered_set<std::string> kStatementStartingKeywords = {
|
static const std::unordered_set<std::string> kStatementStartingKeywords = {
|
||||||
"while", "if", "local", "repeat", "function", "do", "for", "return", "break", "continue", "type", "export"};
|
"while", "if", "local", "repeat", "function", "do", "for", "return", "break", "continue", "type", "export"};
|
||||||
@ -1742,6 +1743,37 @@ static AutocompleteResult autocomplete(const SourceModule& sourceModule, const M
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (AstExprTable* exprTable = node->as<AstExprTable>(); exprTable && FFlag::LuauAutocompleteTableKeysNoInitialCharacter)
|
||||||
|
{
|
||||||
|
AutocompleteEntryMap result;
|
||||||
|
|
||||||
|
if (auto it = module->astExpectedTypes.find(exprTable))
|
||||||
|
{
|
||||||
|
result = autocompleteProps(*module, typeArena, builtinTypes, *it, PropIndexType::Key, ancestry);
|
||||||
|
|
||||||
|
// If the key type is a union of singleton strings,
|
||||||
|
// suggest those too.
|
||||||
|
if (auto ttv = get<TableType>(follow(*it)); ttv && ttv->indexer)
|
||||||
|
{
|
||||||
|
autocompleteStringSingleton(ttv->indexer->indexType, false, node, position, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove keys that are already completed
|
||||||
|
for (const auto& item : exprTable->items)
|
||||||
|
{
|
||||||
|
if (!item.key)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (auto stringKey = item.key->as<AstExprConstantString>())
|
||||||
|
result.erase(std::string(stringKey->value.data, stringKey->value.size));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also offer general expression suggestions
|
||||||
|
autocompleteExpression(sourceModule, *module, builtinTypes, typeArena, ancestry, position, result);
|
||||||
|
|
||||||
|
return {result, ancestry, AutocompleteContext::Property};
|
||||||
|
}
|
||||||
else if (isIdentifier(node) && (parent->is<AstStatExpr>() || parent->is<AstStatError>()))
|
else if (isIdentifier(node) && (parent->is<AstStatExpr>() || parent->is<AstStatError>()))
|
||||||
return {autocompleteStatement(sourceModule, *module, ancestry, position), ancestry, AutocompleteContext::Statement};
|
return {autocompleteStatement(sourceModule, *module, ancestry, position), ancestry, AutocompleteContext::Statement};
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
LUAU_FASTFLAG(LuauTraceTypesInNonstrictMode2)
|
LUAU_FASTFLAG(LuauTraceTypesInNonstrictMode2)
|
||||||
LUAU_FASTFLAG(LuauSetMetatableDoesNotTimeTravel)
|
LUAU_FASTFLAG(LuauSetMetatableDoesNotTimeTravel)
|
||||||
LUAU_FASTFLAG(LuauAutocompleteStringLiteralBounds);
|
LUAU_FASTFLAG(LuauAutocompleteStringLiteralBounds);
|
||||||
|
LUAU_FASTFLAG(LuauAutocompleteTableKeysNoInitialCharacter)
|
||||||
|
|
||||||
using namespace Luau;
|
using namespace Luau;
|
||||||
|
|
||||||
@ -2693,6 +2694,43 @@ local t = {
|
|||||||
CHECK_EQ(ac.context, AutocompleteContext::Property);
|
CHECK_EQ(ac.context, AutocompleteContext::Property);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE_FIXTURE(ACFixture, "suggest_table_keys_no_initial_character")
|
||||||
|
{
|
||||||
|
ScopedFastFlag sff{FFlag::LuauAutocompleteTableKeysNoInitialCharacter, true};
|
||||||
|
|
||||||
|
check(R"(
|
||||||
|
type Test = { first: number, second: number }
|
||||||
|
local t: Test = { @1 }
|
||||||
|
)");
|
||||||
|
|
||||||
|
auto ac = autocomplete('1');
|
||||||
|
CHECK(ac.entryMap.count("first"));
|
||||||
|
CHECK(ac.entryMap.count("second"));
|
||||||
|
CHECK_EQ(ac.context, AutocompleteContext::Property);
|
||||||
|
|
||||||
|
check(R"(
|
||||||
|
type Test = { first: number, second: number }
|
||||||
|
local t: Test = { first = 1, @1 }
|
||||||
|
)");
|
||||||
|
|
||||||
|
ac = autocomplete('1');
|
||||||
|
CHECK_EQ(ac.entryMap.count("first"), 0);
|
||||||
|
CHECK(ac.entryMap.count("second"));
|
||||||
|
CHECK_EQ(ac.context, AutocompleteContext::Property);
|
||||||
|
|
||||||
|
check(R"(
|
||||||
|
type Properties = { TextScaled: boolean, Text: string }
|
||||||
|
local function create(props: Properties) end
|
||||||
|
|
||||||
|
create({ @1 })
|
||||||
|
)");
|
||||||
|
|
||||||
|
ac = autocomplete('1');
|
||||||
|
CHECK(ac.entryMap.count("TextScaled"));
|
||||||
|
CHECK(ac.entryMap.count("Text"));
|
||||||
|
CHECK_EQ(ac.context, AutocompleteContext::Property);
|
||||||
|
}
|
||||||
|
|
||||||
TEST_CASE_FIXTURE(ACFixture, "autocomplete_documentation_symbols")
|
TEST_CASE_FIXTURE(ACFixture, "autocomplete_documentation_symbols")
|
||||||
{
|
{
|
||||||
loadDefinition(R"(
|
loadDefinition(R"(
|
||||||
|
Loading…
Reference in New Issue
Block a user