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

C++: sort the member of a struct in the same order as in the .slint file

Browse source
This commit is contained in:
Olivier Goffart 2023-03-29 19:11:33 +02:00 • committed by GitHub
parent 2e1ce47b79
commit cdaf2abb47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
internal/compiler/generator/cpp.rs
View file

@ -294,6 +294,7 @@ use crate::llr::{
TypeResolutionContext as _,
};
use crate::object_tree::Document;
use crate::parser::syntax_nodes;
use cpp_ast::*;
use itertools::{Either, Itertools};
use std::collections::BTreeMap;
@ -578,8 +579,8 @@ pub fn generate(doc: &Document) -> impl std::fmt::Display {
}
for ty in doc.root_component.used_types.borrow().structs.iter() {
if let Type::Struct { fields, name: Some(name), node: Some(_) } = ty {
generate_struct(&mut file, name, fields);
if let Type::Struct { fields, name: Some(name), node: Some(node) } = ty {
generate_struct(&mut file, name, fields, node);
}
}
@ -637,24 +638,27 @@ pub fn generate(doc: &Document) -> impl std::fmt::Display {
file
}
fn generate_struct(file: &mut File, name: &str, fields: &BTreeMap<String, Type>) {
let mut members = fields
.iter()
.map(|(name, t)| {
fn generate_struct(
file: &mut File,
name: &str,
fields: &BTreeMap<String, Type>,
node: &syntax_nodes::ObjectType,
) {
let mut members = node
.ObjectTypeMember()
.map(|n| crate::parser::identifier_text(&n).unwrap())
.map(|name| {
(
Access::Public,
Declaration::Var(Var {
ty: t.cpp_type().unwrap(),
name: ident(name),
ty: fields.get(&name).unwrap().cpp_type().unwrap(),
name: ident(&name),
..Default::default()
}),
)
})
.collect::<Vec<_>>();
members.sort_unstable_by(|a, b| match (&a.1, &b.1) {
(Declaration::Var(a), Declaration::Var(b)) => a.name.cmp(&b.name),
_ => unreachable!(),
});
members.push((
Access::Public,
Declaration::Function(Function {