Skip to content

Commit

Permalink
Merge branch 'upstream' into merge
Browse files Browse the repository at this point in the history
  • Loading branch information
rblanckaert committed Jun 10, 2022
2 parents 44a5cb6 + 2a4d1ef commit a0522b6
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Analysis/src/Autocomplete.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <utility>

LUAU_FASTFLAGVARIABLE(LuauIfElseExprFixCompletionIssue, false);
LUAU_FASTFLAGVARIABLE(LuauFixAutocompleteClassSecurityLevel, false);
LUAU_FASTFLAG(LuauSelfCallAutocompleteFix)

static const std::unordered_set<std::string> kStatementStartingKeywords = {
Expand Down Expand Up @@ -462,8 +461,7 @@ static void autocompleteProps(const Module& module, TypeArena* typeArena, TypeId
containingClass = containingClass.value_or(cls);
fillProps(cls->props);
if (cls->parent)
autocompleteProps(module, typeArena, rootTy, *cls->parent, indexType, nodes, result, seen,
FFlag::LuauFixAutocompleteClassSecurityLevel ? containingClass : cls);
autocompleteProps(module, typeArena, rootTy, *cls->parent, indexType, nodes, result, seen, containingClass);
}
else if (auto tbl = get<TableTypeVar>(ty))
fillProps(tbl->props);
Expand Down

0 comments on commit a0522b6

Please sign in to comment.