Format the code before the keymaps.

Author: rcorre

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "qmkfmt"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 license = "MIT"
 description = "Formatter for QMK keymaps"

Cargo.toml

@@ -97,7 +97,11 @@ fn format(text: &str, output: &mut impl Write, cli: &Cli) {
     let keymaps = find_keymaps(&language, &tree, &text).expect("No keymaps found");
     let prefix = &text.as_bytes()[0..keymaps.start_byte()];
     let prefix = str::from_utf8(prefix).expect("Text is not utf-8");
-    write!(output, "{prefix}").expect("Failed to write prefix");
+    let prefix = clang_format(prefix);
+
+    // clang-format will strip trailing newlines here, but we want to
+    // keep a space between the prefix and the keymaps, so use writeln
+    writeln!(output, "{prefix}").expect("Failed to write prefix");
     let mut last_byte = keymaps.start_byte();
 
     let query = tree_sitter::Query::new(

src/main.rs

@@ -15,7 +15,7 @@ expression: actual
 #define LYR_FUN 5
 
 enum custom_keycodes {
-  RGB_SLD = ML_SAFE_RANGE,
+    RGB_SLD = ML_SAFE_RANGE,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {