Skip to content

Commit 2cc27f3

Browse files
committed
Display luaurc aliases in original case in require autocompletion
1 parent 891698f commit 2cc27f3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1414

1515
- Fixed `luau-lsp analyze --settings=...` crashing when a malformed settings JSON file is provided. Now, it will print the json error and continue assuming the settings did not exist
1616
- Fixed regression in require by string autocompletion failing to correctly autocomplete files under directories ([#851](https://github.com/JohnnyMorganz/luau-lsp/issues/851))
17+
- Autocompletion in string requires will now show aliases in their original case defined in `.luaurc`, rather than all lowercased
1718

1819
## [1.36.0] - 2024-11-30
1920

src/platform/LSPPlatform.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ std::optional<Luau::AutocompleteEntryMap> LSPPlatform::completionCallback(
209209
// Populate with custom aliases, if we are at the start of a string require
210210
if (contentsString.empty())
211211
{
212-
for (const auto& [aliasName, _] : luauConfig.aliases)
212+
for (const auto& [_, aliasInfo] : luauConfig.aliases)
213213
{
214214
Luau::AutocompleteEntry entry{Luau::AutocompleteEntryKind::String, workspaceFolder->frontend.builtinTypes->stringType, false, false,
215215
Luau::TypeCorrectKind::Correct};
216216
entry.tags.push_back("Alias");
217-
result.insert_or_assign("@" + aliasName, entry);
217+
result.insert_or_assign("@" + aliasInfo.originalCase, entry);
218218
}
219219
// DEPRECATED
220220
for (const auto& [aliasName, _] : config.require.fileAliases)

tests/Autocomplete.test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@ TEST_CASE_FIXTURE(Fixture, "string_require_contains_luaurc_aliases")
833833
CHECK_EQ(result.size(), 4);
834834
checkFolderCompletionExists(result, "..");
835835
checkFileCompletionExists(result, "source.luau");
836-
requireItem(result, "@roact");
837-
requireItem(result, "@fusion");
836+
requireItem(result, "@Roact");
837+
requireItem(result, "@Fusion");
838838
}
839839

840840
TEST_CASE_FIXTURE(Fixture, "string_require_contains_file_aliases")

0 commit comments

Comments
 (0)