Fix formatting of bitfields with literal fields

bbannier · Oct 5, 2023 · b6aa716 · b6aa716
1 parent 87e9a06
commit b6aa716
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/corpus/bitfield.spicy b/corpus/bitfield.spicy
@@ -6,3 +6,9 @@ type X = unit {
 		b: 0..8; # bar
 	};
 };
+
+type X =   bitfield(8) {
+    a: 0..3=2;
+    b: 4..7;
+    c: 7     = 1;
+  };
diff --git a/corpus/bitfield.spicy.expected b/corpus/bitfield.spicy.expected
@@ -6,3 +6,9 @@ type X = unit {
         b: 0..8; # bar
     };
 };
+
+type X = bitfield(8) {
+    a: 0..3 = 2;
+    b: 4..7;
+    c: 7 = 1;
+};
diff --git a/src/query.scm b/src/query.scm
@@ -322,14 +322,22 @@
   (sink)
 )
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Bitfields.
+
 (
  "bitfield"
  (_)
  "{" @prepend_space
 )
 
+; All bitfield fields go on a new line.
+(bitfield
+  (bitfield_field) @prepend_hardline
+)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Preprocessor macros
+; Preprocessor macros.
 
 ; Empty lines before preprocessor blocks are fine.
 (preproc) @allow_blank_line_before