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

Put what is the FileDiagnostics into the SourceFile so the SourceFile has the content

Browse source
This commit is contained in:
Olivier Goffart 2021-03-11 16:23:46 +01:00
parent 7c48bcdd4c
commit 968dfaae87
8 changed files with 70 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/sixtyfps-rs/sixtyfps-macros/lib.rs
View file

@ -328,8 +328,7 @@ pub fn sixtyfps(stream: TokenStream) -> TokenStream {
let source_file = if let Some(cargo_manifest) = std::env::var_os("CARGO_MANIFEST_DIR") {
let mut path: std::path::PathBuf = cargo_manifest.into();
path.push("Cargo.toml");
diag.current_path = std::rc::Rc::new(path);
Some(diag.current_path.clone())
Some(diagnostics::SourceFileInner::from_path(path))
} else {
None
};
@ -371,7 +370,7 @@ fn report_diagnostics(
let mut result = TokenStream::new();
let mut needs_error = diag.has_error();
for mut file_diag in diag.into_iter() {
if file_diag.source.is_none() {
if file_diag.current_path.path() == std::path::PathBuf::default() {
file_diag.map_offsets_to_span(span_map);
needs_error &= !file_diag.has_error();
result.extend(TokenStream::from(file_diag.into_token_stream()))