language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 18:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: nested array bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-04-05 11:47:15 +09:00
parent 84bd0259eb
commit 018080be41
15 changed files with 232 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/erg_compiler/error/mod.rs
View file

@ -639,8 +639,14 @@ mod test {
let input = Input::pipe("pred unification error".to_string());
let lhs = &Predicate::Const("Str".into());
let rhs = &Predicate::Const("Nat".into());
let err =
TyCheckError::pred_unification_error(input, errno, lhs, rhs, caused_by.to_string());
let err = TyCheckError::pred_unification_error(
input,
errno,
lhs,
rhs,
Location::Unknown,
caused_by.to_string(),
);
errors.push(err);
let input = Input::pipe("Trait member type error".to_string());

13
crates/erg_compiler/error/tycheck.rs
View file

@ -772,8 +772,9 @@ passed keyword args: {kw_args_len}"
pub fn pred_unification_error(
input: Input,
errno: usize,
lhs: &Predicate,
rhs: &Predicate,
sub_pred: &Predicate,
super_pred: &Predicate,
loc: Location,
caused_by: String,
) -> Self {
let mut lhs_uni = StyledStrings::default();
@ -783,7 +784,7 @@ passed keyword args: {kw_args_len}"
"traditional_chinese" => lhs_uni.push_str("左邊: "),
"english" => lhs_uni.push_str("lhs: "),
);
lhs_uni.push_str_with_color_and_attr(format!("{lhs}"), HINT, ATTR);
lhs_uni.push_str_with_color_and_attr(format!("{sub_pred}"), HINT, ATTR);
let mut rhs_uni = StyledStrings::default();
switch_lang!(
"japanese" => rhs_uni.push_str("右辺: "),
@ -791,11 +792,11 @@ passed keyword args: {kw_args_len}"
"traditional_chinese" => rhs_uni.push_str("右邊: "),
"english" => rhs_uni.push_str("rhs: "),
);
rhs_uni.push_str_with_color_and_attr(format!("{rhs}"), ERR, ATTR);
rhs_uni.push_str_with_color_and_attr(format!("{super_pred}"), ERR, ATTR);
Self::new(
ErrorCore::new(
vec![SubMessage::ambiguous_new(
Location::Unknown,
loc,
vec![lhs_uni.to_string(), rhs_uni.to_string()],
None,
)],
@ -807,7 +808,7 @@ passed keyword args: {kw_args_len}"
),
errno,
TypeError,
Location::Unknown,
loc,
),
input,
caused_by,