luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Create new implementation

Browse source
This commit is contained in:
HawDevelopment 2022-08-24 17:57:29 +02:00
parent 7ac854dba9
commit 9436235421
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Analysis/src/Frontend.cpp
View file

@ -685,29 +685,23 @@ ScopePtr Frontend::getModuleEnvironment(const SourceModule& module, const Config
} }
} }
if (!config.globalTypePaths.empty()) auto& types = config.globalTypePaths;
{ bool isGlobalTypePath = std::find(types.begin(), types.end(), module.name) != types.end();
unfreeze(typeChecker.globalTypes);
if (!isGlobalTypePath && !types.empty())
{
result = std::make_shared<Scope>(result); result = std::make_shared<Scope>(result);
for (const std::string& path : config.globalTypePaths) for (const std::string& path : config.globalTypePaths)
{ {
ModulePtr module = moduleResolver.getModule(path); ModulePtr module = moduleResolver.getModule(path);
if (!module) if (!module)
return;
for (const auto& [name, ty] : module->getModuleScope()->exportedTypeBindings)
{ {
auto sourceCode = fileResolver->readSource(path); result->exportedTypeBindings[name] = ty;
if (!sourceCode)
continue;
SourceModule sourceModule = parse(path, sourceCode->source, {});
module = typeChecker.check(sourceModule, Mode::Strict);
if (!module)
continue;
} }
loadModuleIntoScope(typeChecker, module, result, path);
} }
freeze(typeChecker.globalTypes);
} }
return result; return result;
@ -929,6 +923,9 @@ std::pair<SourceNode*, SourceModule*> Frontend::getSourceNode(CheckResult& check
sourceNode.requireLocations = require.requireList; sourceNode.requireLocations = require.requireList;
if (!config.globalTypePaths.empty())
sourceNode.requireSet.insert(config.globalTypePaths.begin(), config.globalTypePaths.end());
return {&sourceNode, &sourceModule}; return {&sourceNode, &sourceModule};
} }