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

Remove some more use of SyntaxNode and SyntaxToken

Browse source
This commit is contained in:
Olivier Goffart 2021-04-13 16:48:09 +02:00
parent 5c795e7bab
commit cb06394685
3 changed files with 25 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,21 +320,18 @@ pub fn sixtyfps(stream: TokenStream) -> TokenStream {
let mut tokens = vec![];
fill_token_vec(token_iter, &mut tokens);
let mut diag = BuildDiagnostics::default();
let syntax_node = parser::parse_tokens(tokens.clone(), &mut diag);
if diag.has_error() {
return diag.report_macro_diagnostic(&tokens);
}
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");
Some(diagnostics::SourceFileInner::from_path_only(path))
diagnostics::SourceFileInner::from_path_only(path)
} else {
None
diagnostics::SourceFileInner::from_path_only(Default::default())
};
let syntax_node = parser::SyntaxNodeWithSourceFile { node: syntax_node, source_file };
let mut diag = BuildDiagnostics::default();
let syntax_node = parser::parse_tokens(tokens.clone(), source_file.into(), &mut diag);
if diag.has_error() {
return diag.report_macro_diagnostic(&tokens);
}
//println!("{:#?}", syntax_node);
let mut compiler_config =