language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-23 14:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Hide params from annotation type mismatches

Browse source
This commit is contained in:
Agus Zubiaga 2024-08-27 19:06:31 -03:00
parent a4f4d00ff0
commit d033057a58
No known key found for this signature in database
5 changed files with 117 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/compiler/lower_params/src/type_error.rs
View file

@ -1,4 +1,4 @@
use roc_can::expected::Expected;
use roc_can::{expected::Expected, pattern::Pattern};
use roc_module::symbol::{ModuleId, Symbol};
use roc_region::all::Loc;
use roc_solve_problem::TypeError;
@ -32,9 +32,47 @@ pub fn remove_module_param_arguments(
for error in errors {
match error {
TypeError::BadExpr(_, _, found, Expected::ForReason(reason, expected, _)) => {
remove_with_bad_expr_reason(&env, found, reason, expected);
remove_for_reason(&env, found, reason, expected);
}
TypeError::BadExpr(_, _, _, _) => todo!("{:?}", error),
TypeError::BadExpr(
_,
_,
found,
Expected::FromAnnotation(
Loc {
value: Pattern::Identifier(name),
region: _,
},
arity,
_,
expected,
),
) if env.is_extended(name) => {
if *arity > 1 {
*arity -= 1;
}
drop_last_argument(found);
drop_last_argument(expected);
if let (
ErrorType::Function(found_args, _, _),
ErrorType::Function(expected_args, _, _),
) = (found, expected)
{
if found_args.len() > expected_args.len() {
// If the found arity doesn't match the annotation's, the params
// record would appear in the error, so we replace it with `?`.
if let Some(last) = found_args.last_mut() {
*last = ErrorType::Error;
}
}
}
}
TypeError::BadExpr(_, _, _, Expected::FromAnnotation(_, _, _, _))
| TypeError::BadExpr(_, _, _, Expected::NoExpectation(_)) => {}
// Irrelevant
TypeError::BadPattern(_, _, _, _)
@ -80,7 +118,7 @@ impl Env {
}
}
fn remove_with_bad_expr_reason(
fn remove_for_reason(
env: &Env,
found_type: &mut ErrorType,
reason: &mut Reason,

14
crates/compiler/types/src/types.rs
View file

@ -3594,7 +3594,7 @@ pub enum Mismatch {
pub type DoesNotImplementAbility = Vec<(ErrorType, Symbol)>;
#[derive(PartialEq, Eq, Clone, Hash)]
#[derive(PartialEq, Eq, Clone, Hash, Debug)]
pub enum ErrorType {
Infinite,
Type(Symbol, Vec<ErrorType>),
@ -3619,12 +3619,12 @@ pub enum ErrorType {
Error,
}
impl std::fmt::Debug for ErrorType {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
// TODO remove clone
write!(f, "{:?}", write_debug_error_type(self.clone()))
}
}
// impl std::fmt::Debug for ErrorType {
// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
// // TODO remove clone
// write!(f, "{:?}", write_debug_error_type(self.clone()))
// }
// }
impl ErrorType {
pub fn unwrap_structural_alias(self) -> ErrorType {