From 3c764b427bda59db3a2f27e3f227d6aebe052ec2 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Sun, 8 Jun 2025 22:19:29 +0200 Subject: grit: Keep part when expanding Makes it possible to still keep track of which file a string comes from. --- server/common/src/tests.rs | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'server/common/src/tests.rs') diff --git a/server/common/src/tests.rs b/server/common/src/tests.rs index e7d6815..09e780b 100644 --- a/server/common/src/tests.rs +++ b/server/common/src/tests.rs @@ -394,11 +394,10 @@ async fn test_grit_parse_base() { grit::IfMessagePart::If { expr: "pp_ifdef('include_extra')".to_string(), message: vec![ - grit::IfMessagePart::Part( - grit::PartRef { - file: "extra.grdp".to_string(), - }, - ), + grit::IfMessagePart::Part { + file: "extra.grdp".to_string(), + messages: vec![], + }, ], }, grit::IfMessagePart::Message( @@ -555,17 +554,22 @@ async fn test_grit_parse_include_parts() { grit::IfMessagePart::If { expr: "pp_ifdef('include_extra')".to_string(), message: vec![ - grit::IfMessagePart::Message( - grit::Message { - desc: "Extra title".to_string(), - name: "IDS_EXTRA".to_string(), - internal_comment: None, - meaning: None, - content: vec![ - grit::TextPlaceholder::Text("Extra title".to_string()), - ], - }, - ), + grit::IfMessagePart::Part { + file: "extra.grdp".to_string(), + messages: vec![ + grit::IfMessagePart::Message( + grit::Message { + desc: "Extra title".to_string(), + name: "IDS_EXTRA".to_string(), + internal_comment: None, + meaning: None, + content: vec![ + grit::TextPlaceholder::Text("Extra title".to_string()), + ], + }, + ), + ], + }, ], }, grit::IfMessagePart::Message( -- cgit v1.2.3-70-g09d2