Preserve module groups when formatting

src/analyzer.rs

@@ -15,7 +15,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
   pub(crate) fn analyze(
     asts: &'run HashMap<PathBuf, Ast<'src>>,
     doc: Option<String>,
-    groups: &[String],
+    groups: &[StringLiteral<'src>],
     loaded: &[PathBuf],
     name: Option<Name<'src>>,
     paths: &HashMap<PathBuf, PathBuf>,
@@ -28,7 +28,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
     mut self,
     asts: &'run HashMap<PathBuf, Ast<'src>>,
     doc: Option<String>,
-    groups: &[String],
+    groups: &[StringLiteral<'src>],
     loaded: &[PathBuf],
     name: Option<Name<'src>>,
     paths: &HashMap<PathBuf, PathBuf>,

src/item.rs

@@ -15,7 +15,7 @@ pub(crate) enum Item<'src> {
   Module {
     absolute: Option<PathBuf>,
     doc: Option<String>,
-    groups: Vec<String>,
+    groups: Vec<StringLiteral<'src>>,
     name: Name<'src>,
     optional: bool,
     relative: Option<StringLiteral<'src>>,
@@ -45,11 +45,16 @@ impl Display for Item<'_> {
         write!(f, " {relative}")
       }
       Self::Module {
+        groups,
         name,
-        relative,
         optional,
+        relative,
         ..
       } => {
+        for group in groups {
+          writeln!(f, "[group: {group}]")?;
+        }
+
         write!(f, "mod")?;
 
         if *optional {

src/justfile.rs

@@ -13,7 +13,7 @@ pub(crate) struct Justfile<'src> {
   #[serde(rename = "first", serialize_with = "keyed::serialize_option")]
   pub(crate) default: Option<Arc<Recipe<'src>>>,
   pub(crate) doc: Option<String>,
-  pub(crate) groups: Vec<String>,
+  pub(crate) groups: Vec<StringLiteral<'src>>,
   #[serde(skip)]
   pub(crate) loaded: Vec<PathBuf>,
   #[serde(skip)]
@@ -468,8 +468,12 @@ impl<'src> Justfile<'src> {
     recipes
   }
 
-  pub(crate) fn groups(&self) -> &[String] {
-    &self.groups
+  pub(crate) fn groups(&self) -> Vec<&str> {
+    self
+      .groups
+      .iter()
+      .map(|group| group.cooked.as_str())
+      .collect()
   }
 
   pub(crate) fn public_groups(&self, config: &Config) -> Vec<String> {

src/parser.rs

@@ -411,7 +411,7 @@ impl<'run, 'src> Parser<'run, 'src> {
             let mut groups = Vec::new();
             for attribute in attributes {
               if let Attribute::Group(group) = attribute {
-                groups.push(group.cooked);
+                groups.push(group);
               }
             }
 

tests/format.rs

@@ -1589,3 +1589,25 @@ fn private_variable() {
     )
     .run();
 }
+
+#[test]
+fn module_groups_are_preserved() {
+  Test::new()
+    .justfile(
+      r#"
+        [group('bar')]
+        [group("baz")]
+        mod foo
+      "#,
+    )
+    .write("foo.just", "")
+    .arg("--dump")
+    .stdout(
+      r#"
+        [group: 'bar']
+        [group: "baz"]
+        mod foo
+      "#,
+    )
+    .run();
+}