language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 06:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Try our best to generate a document node, even when there are errors

Browse source
This commit is contained in:
Olivier Goffart 2021-04-14 12:06:02 +02:00
parent 6837086647
commit 49868a8dae
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sixtyfps_compiler/tests/typeloader/recursive_import2.60
View file

@ -15,6 +15,5 @@ export Rec2 := Rectangle {
} }
export Rect21 := Rec1 { export Rect21 := Rec1 {
// ^error{Unknown type Rec1}
property <int> Bar: 45; property <int> Bar: 45;
} }

26
sixtyfps_compiler/typeloader.rs
View file

@ -284,17 +284,8 @@ impl<'a> TypeLoader<'a> {
source_code: String, source_code: String,
diagnostics: &mut BuildDiagnostics, diagnostics: &mut BuildDiagnostics,
) { ) {
let dependency_doc = crate::parser::parse(source_code, Some(&source_path), diagnostics); let dependency_doc: syntax_nodes::Document =
crate::parser::parse(source_code, Some(&source_path), diagnostics).into();
if diagnostics.has_error() {
let mut d = Document::default();
d.node = Some(dependency_doc.into());
d.local_registry = TypeRegister::new(&self.global_type_registry);
self.all_documents.docs.insert(path.to_owned(), d);
return;
}
let dependency_doc: syntax_nodes::Document = dependency_doc.into();
let dependency_registry = let dependency_registry =
Rc::new(RefCell::new(TypeRegister::new(&self.global_type_registry))); Rc::new(RefCell::new(TypeRegister::new(&self.global_type_registry)));
@ -302,6 +293,19 @@ impl<'a> TypeLoader<'a> {
.load_dependencies_recursively(&dependency_doc, diagnostics, &dependency_registry) .load_dependencies_recursively(&dependency_doc, diagnostics, &dependency_registry)
.await; .await;
if diagnostics.has_error() {
// If there was error (esp parse error) we don't want to report further error in this document.
// because they might be nonsense (TODO: we should check that the parse error were really in this document).
// But we still want to create a document to give better error messages in the root document.
let doc = crate::object_tree::Document::from_node(
dependency_doc,
foreign_imports,
&mut BuildDiagnostics::default(), // New diagnostics that we will ignore
&dependency_registry,
);
self.all_documents.docs.insert(path.to_owned(), doc);
return;
}
let doc = crate::object_tree::Document::from_node( let doc = crate::object_tree::Document::from_node(
dependency_doc, dependency_doc,
foreign_imports, foreign_imports,