Autocomplete require-by-string (#263)

* Update Luau

* Trigger completion on /

* Attach require tag

* Autocomplete files

* Update changelog

Author: JohnnyMorganz

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Added syntax highlighting support for interpolated strings
 - Added color viewers for Color3.new/fromRGB/fromHSV/fromHex
+- Added support for autocompleting require-by-string functions with files and folders
 - Support documentation comments on variables:
 
 ```lua

luau

@@ -61,7 +61,7 @@ lsp::ServerCapabilities LanguageServer::getServerCapabilities()
     lsp::ServerCapabilities capabilities;
     capabilities.textDocumentSync = lsp::TextDocumentSyncKind::Incremental;
     // Completion
-    std::vector<std::string> completionTriggerCharacters{".", ":", "'", "\"", "\n"}; // \n is used to trigger end completion
+    std::vector<std::string> completionTriggerCharacters{".", ":", "'", "\"", "/", "\n"}; // \n is used to trigger end completion
     lsp::CompletionOptions::CompletionItem completionItem{/* labelDetailsSupport: */ true};
     capabilities.completionProvider = {completionTriggerCharacters, std::nullopt, /* resolveProvider: */ false, completionItem};
     // Hover Provider

src/LanguageServer.cpp

@@ -164,6 +164,8 @@ void WorkspaceFolder::initialize()
     Luau::registerBuiltinGlobals(frontend.typeChecker);
     Luau::registerBuiltinGlobals(frontend.typeCheckerForAutocomplete);
 
+    Luau::attachTag(Luau::getGlobalBinding(frontend.typeCheckerForAutocomplete, "require"), "Require");
+
     if (client->definitionsFiles.empty())
     {
         client->sendLogMessage(lsp::MessageType::Warning, "No definitions file provided by client");

src/Workspace.cpp

@@ -312,7 +312,8 @@ std::vector<lsp::CompletionItem> WorkspaceFolder::completion(const lsp::Completi
 
     auto position = textDocument->convertPosition(params.position);
     auto result = Luau::autocomplete(frontend, moduleName, position,
-        [&](std::string tag, std::optional<const Luau::ClassType*> ctx) -> std::optional<Luau::AutocompleteEntryMap>
+        [&](std::string tag, std::optional<const Luau::ClassType*> ctx,
+            std::optional<std::string> contents) -> std::optional<Luau::AutocompleteEntryMap>
         {
             if (tag == "ClassNames")
             {
@@ -372,6 +373,46 @@ std::vector<lsp::CompletionItem> WorkspaceFolder::completion(const lsp::Completi
 
                 return result;
             }
+            else if (tag == "Require")
+            {
+                if (!contents.has_value())
+                    return std::nullopt;
+
+                try
+                {
+                    auto contentsString = contents.value();
+                    auto currentDirectory = rootUri.fsPath().append(contentsString);
+
+                    Luau::AutocompleteEntryMap result;
+                    for (const auto& dir_entry : std::filesystem::directory_iterator(currentDirectory))
+                    {
+                        if (dir_entry.is_regular_file() || dir_entry.is_directory())
+                        {
+                            std::string fileName = dir_entry.path().filename().generic_string();
+                            Luau::AutocompleteEntry entry{
+                                Luau::AutocompleteEntryKind::String, frontend.builtinTypes->stringType, false, false, Luau::TypeCorrectKind::Correct};
+                            entry.tags.push_back(dir_entry.is_directory() ? "Directory" : "File");
+
+                            result.insert_or_assign(fileName, entry);
+                        }
+                    }
+
+                    // Add in ".." support
+                    if (currentDirectory.has_parent_path())
+                    {
+                        Luau::AutocompleteEntry dotdotEntry{
+                            Luau::AutocompleteEntryKind::String, frontend.builtinTypes->stringType, false, false, Luau::TypeCorrectKind::Correct};
+                        dotdotEntry.tags.push_back("Directory");
+                        result.insert_or_assign("..", dotdotEntry);
+                    }
+
+                    return result;
+                }
+                catch (std::exception&)
+                {
+                    return std::nullopt;
+                }
+            }
 
             return std::nullopt;
         });
@@ -424,6 +465,18 @@ std::vector<lsp::CompletionItem> WorkspaceFolder::completion(const lsp::Completi
             break;
         }
 
+        // Special cases: Files and directory
+        if (std::find(entry.tags.begin(), entry.tags.end(), "File") != entry.tags.end())
+        {
+            item.kind = lsp::CompletionItemKind::File;
+            // We shouldn't include the extension when inserting
+            std::string insertText = name;
+            insertText.erase(insertText.find_last_of('.'));
+            item.insertText = insertText;
+        }
+        else if (std::find(entry.tags.begin(), entry.tags.end(), "Directory") != entry.tags.end())
+            item.kind = lsp::CompletionItemKind::Folder;
+
         // Handle if name is not an identifier
         if (entry.kind == Luau::AutocompleteEntryKind::Property && !Luau::isIdentifier(name))
         {