language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 03:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Do not lower params for check and lang srv

Browse source
This commit is contained in:
Agus Zubiaga 2024-08-26 22:00:25 -03:00
parent 50f8f2cb1d
commit 4e35a68f98
No known key found for this signature in database
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,6 +310,7 @@ fn start_phase<'a>(
abilities_store, abilities_store,
skip_constraint_gen, skip_constraint_gen,
exposed_module_ids: state.exposed_modules, exposed_module_ids: state.exposed_modules,
exec_mode: state.exec_mode,
} }
} }
@ -889,6 +890,7 @@ enum BuildTask<'a> {
abilities_store: PendingAbilitiesStore, abilities_store: PendingAbilitiesStore,
exposed_module_ids: &'a [ModuleId], exposed_module_ids: &'a [ModuleId],
skip_constraint_gen: bool, skip_constraint_gen: bool,
exec_mode: ExecutionMode,
}, },
Solve { Solve {
module: Module, module: Module,
@ -5003,6 +5005,7 @@ fn canonicalize_and_constrain<'a>(
parsed: ParsedModule<'a>, parsed: ParsedModule<'a>,
skip_constraint_gen: bool, skip_constraint_gen: bool,
exposed_module_ids: &[ModuleId], exposed_module_ids: &[ModuleId],
exec_mode: ExecutionMode,
) -> CanAndCon { ) -> CanAndCon {
let canonicalize_start = Instant::now(); let canonicalize_start = Instant::now();
@ -5088,14 +5091,22 @@ fn canonicalize_and_constrain<'a>(
// _before has an underscore because it's unused in --release builds // _before has an underscore because it's unused in --release builds
let _before = roc_types::types::get_type_clone_count(); let _before = roc_types::types::get_type_clone_count();
// lower module params match exec_mode {
roc_lower_params::lower::lower( ExecutionMode::Check => {
module_id, // No need to lower params for `roc check` and lang server
&module_output.module_params, // If we did, we'd have to update the language server to exclude the extra arguments
&mut module_output.declarations, }
&mut module_output.scope.locals.ident_ids, ExecutionMode::Executable | ExecutionMode::ExecutableIfCheck | ExecutionMode::Test => {
&mut var_store, // lower module params
); roc_lower_params::lower::lower(
module_id,
&module_output.module_params,
&mut module_output.declarations,
&mut module_output.scope.locals.ident_ids,
&mut var_store,
);
}
}
let mut constraints = Constraints::new(); let mut constraints = Constraints::new();
@ -6215,6 +6226,7 @@ fn run_task<'a>(
abilities_store, abilities_store,
skip_constraint_gen, skip_constraint_gen,
exposed_module_ids, exposed_module_ids,
exec_mode,
} => { } => {
let can_and_con = canonicalize_and_constrain( let can_and_con = canonicalize_and_constrain(
arena, arena,
@ -6226,6 +6238,7 @@ fn run_task<'a>(
parsed, parsed,
skip_constraint_gen, skip_constraint_gen,
exposed_module_ids, exposed_module_ids,
exec_mode,
); );
Ok(Msg::CanonicalizedAndConstrained(can_and_con)) Ok(Msg::CanonicalizedAndConstrained(can_and_con))