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

slintpad: Fix loading of additinal slint files

Browse source 
Do not extract the file loading into a fuinction: That keeps 
`self` around which is part of a borrowed state. That is a
problem as during the load we end up in `ensure_document_loaded`
again, which will try to borrow_mut that same state.
This commit is contained in:
Tobias Hunger 2024-10-16 14:22:47 +02:00 • committed by Tobias Hunger
parent d9e40caff9
commit 30ef606d04
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/compiler/typeloader.rs
View file

@ -1029,17 +1029,6 @@ impl TypeLoader {
}
}
/// Read a file, taking the `CompilerConfiguration`s `open_import_fallback`
/// into account when necessary.
async fn read_file(&self, path: &Path) -> Result<String, std::io::Error> {
if let Some(fallback) = self.compiler_config.open_import_fallback.clone() {
let result = fallback(path.to_string_lossy().into()).await;
result.unwrap_or_else(|| std::fs::read_to_string(path))
} else {
std::fs::read_to_string(path)
}
}
async fn ensure_document_loaded<'a: 'b, 'b>(
state: &'a RefCell<BorrowedTypeLoader<'a>>,
file_to_import: &'b str,
@ -1140,7 +1129,13 @@ impl TypeLoader {
.expect("internal error: embedded file is not UTF-8 source code"),
))
} else {
state.borrow().tl.read_file(&path_canon).await
let fallback = state.borrow().tl.compiler_config.open_import_fallback.clone();
if let Some(fallback) = fallback {
let result = fallback(path_canon.to_string_lossy().into()).await;
result.unwrap_or_else(|| std::fs::read_to_string(&path_canon))
} else {
std::fs::read_to_string(&path_canon)
}
};
let ok = match source_code_result {