Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new fragment typecheck/autocompletion APIs #841

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use new fragment typecheck/autocompletion APIs #841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions src/operations/Completion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

#include "Luau/AstQuery.h"
#include "Luau/Autocomplete.h"
#include "Luau/AutocompleteTypes.h"
#include "Luau/Common.h"
#include "Luau/FragmentAutocomplete.h"
#include "Luau/TxnLog.h"
#include "Luau/TypeUtils.h"
#include "Luau/TimeTrace.h"
Expand All @@ -14,6 +17,9 @@
#include "LSP/DocumentationParser.hpp"

LUAU_FASTFLAG(LuauSolverV2)
LUAU_FASTFLAG(LuauAllowFragmentParsing)
LUAU_FASTFLAG(LuauStoreDFGOnModule2)
LUAU_FASTFLAG(LuauAutocompleteRefactorsForIncrementalAutocomplete)

void WorkspaceFolder::endAutocompletion(const lsp::CompletionParams& params)
{
Expand Down Expand Up @@ -424,13 +430,33 @@ std::vector<lsp::CompletionItem> WorkspaceFolder::completion(const lsp::Completi
checkStrict(moduleName, /* forAutocomplete: */ true);

auto position = textDocument->convertPosition(params.position);
auto result = Luau::autocomplete(frontend, moduleName, position,
[&](const std::string& tag, std::optional<const Luau::ClassType*> ctx,
std::optional<std::string> contents) -> std::optional<Luau::AutocompleteEntryMap>
{
tags.insert(tag);
return platform->completionCallback(tag, ctx, std::move(contents), moduleName);
});
Luau::AutocompleteResult result;
if (FFlag::LuauAllowFragmentParsing && FFlag::LuauAutocompleteRefactorsForIncrementalAutocomplete && FFlag::LuauStoreDFGOnModule2)
{
Luau::FrontendOptions options;
options.retainFullTypeGraphs = true;
options.runLintChecks = false;
if (!FFlag::LuauSolverV2)
options.forAutocomplete = true;

result = Luau::fragmentAutocomplete(frontend, textDocument->getText(), moduleName, position, options,
[&](const std::string& tag, std::optional<const Luau::ClassType*> ctx,
std::optional<std::string> contents) -> std::optional<Luau::AutocompleteEntryMap>
{
tags.insert(tag);
return platform->completionCallback(tag, ctx, std::move(contents), moduleName);
}).acResults;
}
else
{
result = Luau::autocomplete(frontend, moduleName, position,
[&](const std::string& tag, std::optional<const Luau::ClassType*> ctx,
std::optional<std::string> contents) -> std::optional<Luau::AutocompleteEntryMap>
{
tags.insert(tag);
return platform->completionCallback(tag, ctx, std::move(contents), moduleName);
});
}


std::vector<lsp::CompletionItem> items{};
Expand Down
Loading