language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Load and can imports inside defs

Browse source 
After parsing a module, we now recursively traverse the tree to find
all imports inside Defs, not just the top-level ones.

Previously, imported modules were available in the entire file,
but that's no longer the case. Therefore, Scope now keeps track of
imported modules and Env::qualified_lookup checks whether a module
is available in the provided scope.

Note: Unused import warnings are still global and need to be updated.
This commit is contained in:
Agus Zubiaga 2024-01-06 18:34:04 -03:00
parent 710d62f754
commit c617963b22
No known key found for this signature in database
10 changed files with 434 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/compiler/load_internal/src/file.rs
View file

@ -2148,6 +2148,7 @@ fn report_unused_imported_modules(
module_id: ModuleId,
constrained_module: &ConstrainedModule,
) {
// [modules-revamp] TODO: take expr-level into account
let mut unused_imported_modules = constrained_module.imported_modules.clone();
let mut unused_imports = constrained_module.module.exposed_imports.clone();
@ -5228,35 +5229,23 @@ fn parse<'a>(
let mut imported: Vec<(QualifiedModuleName, Region)> = vec![];
for (index, either_index) in parsed_defs.tags.iter().enumerate() {
if let Err(value_index) = either_index.split() {
let value_def = &parsed_defs.value_defs[value_index.index()];
let region = parsed_defs.regions[index];
for (def, region) in ast::RecursiveValueDefIter::new(&parsed_defs) {
match def {
ValueDef::ModuleImport(import) => {
let qualified_module_name = QualifiedModuleName {
opt_package: import.name.value.package,
module: import.name.value.name.into(),
};
match value_def {
ValueDef::Annotation(..) => {}
ValueDef::ModuleImport(import) => {
let qualified_module_name = QualifiedModuleName {
opt_package: import.name.value.package,
module: import.name.value.name.into(),
};
imported.push((qualified_module_name, region));
}
ValueDef::IngestedFileImport(_ingested_file) => {
todo!("[modules-revamp] do we need to do anything here?")
}
_ => {
// [modules-revamp] TODO: traverse exprs
}
imported.push((qualified_module_name, *region));
}
ValueDef::IngestedFileImport(_ingested_file) => {
todo!("[modules-revamp] do we need to do anything here?")
}
_ => {}
}
}
let mut exposed: Vec<Symbol> = Vec::with_capacity(num_exposes);
// Make sure the module_ids has ModuleIds for all our deps,