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

add proper error messages for ingested files

Browse source
This commit is contained in:
Brendan Hansknecht 2023-04-07 18:16:43 -07:00
parent 62fcc71be3
commit e5b88366fe
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
5 changed files with 86 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/compiler/mono/src/ir.rs
View file

@ -4186,9 +4186,11 @@ pub fn with_hole<'a>(
Layout::STR,
hole,
),
_ => unreachable!(
"All of these cases should be dealt during solve, generating proper errors"
),
_ => {
// This will not manifest as a real runtime error and is just returned to have a value here.
// The actual type error during solve will be fatal.
runtime_error(env, "Invalid type for ingested file")
}
}
}
SingleQuote(_, _, character, _) => {

45
crates/compiler/solve/src/solve.rs
View file

@ -1771,7 +1771,7 @@ fn solve(
state
}
IngestedFile(type_index, _, bytes) => {
IngestedFile(type_index, file_path, bytes) => {
let actual = either_type_index_to_var(
subs,
rank,
@ -1794,34 +1794,37 @@ fn solve(
) {
// List U8 always valid.
subs.rollback_to(snapshot);
state
} else if let Success { .. } = unify(
return state;
}
subs.rollback_to(snapshot);
let snapshot = subs.snapshot();
// We explicitly match on the last unify to get the type in the case it errors.
match unify(
&mut UEnv::new(subs),
actual,
Variable::STR,
Mode::EQ,
Polarity::OF_VALUE,
) {
// Str only valid if valid utf8.
if std::str::from_utf8(bytes).is_err() {
todo!("add type error due to not being a utf8 string");
Success { .. } => {
// Str only valid if valid utf8.
if let Err(err) = std::str::from_utf8(bytes) {
let problem = TypeError::IngestedFileBadUtf8(file_path.clone(), err);
problems.push(problem);
}
subs.rollback_to(snapshot);
state
}
Failure(_, actual_type, _, _) => {
subs.rollback_to(snapshot);
subs.rollback_to(snapshot);
state
} else {
// Unexpected type.
todo!("Add type error for unsupported ingested file type");
// let problem = TypeError::BadExpr(
// *region,
// Category::Lookup(*symbol),
// actual_type,
// expectation.replace_ref(expected_type),
// );
// problems.push(problem);
// subs.rollback_to(snapshot);
// state
let problem =
TypeError::IngestedFileUnsupportedType(file_path.clone(), actual_type);
problems.push(problem);
state
}
}
}
};

6
crates/compiler/solve_problem/src/lib.rs
View file

@ -1,4 +1,6 @@
//! Provides types to describe problems that can occur during solving.
use std::{path::Path, str::Utf8Error};
use roc_can::expected::{Expected, PExpected};
use roc_module::{ident::Lowercase, symbol::Symbol};
use roc_problem::{can::CycleEntry, Severity};
@ -29,6 +31,8 @@ pub enum TypeError {
expected_opaque: Symbol,
found_opaque: Symbol,
},
IngestedFileBadUtf8(Box<Path>, Utf8Error),
IngestedFileUnsupportedType(Box<Path>, ErrorType),
}
impl TypeError {
@ -48,6 +52,8 @@ impl TypeError {
TypeError::Exhaustive(exhtv) => exhtv.severity(),
TypeError::StructuralSpecialization { .. } => RuntimeError,
TypeError::WrongSpecialization { .. } => RuntimeError,
TypeError::IngestedFileBadUtf8(..) => Fatal,
TypeError::IngestedFileUnsupportedType(..) => Fatal,
}
}
}