progress

Author: psteinroe

crates/pgt_cli/tests/assert_cmd.rs

@@ -33,7 +33,7 @@ fn test_cli_check_command() {
 
 fn normalize_output(status: ExitStatus, stdout: &str, stderr: &str) -> String {
     let normalized_stdout = normalize_durations(stdout);
-    let normalized_stderr = normalize_durations(stderr);
+    let normalized_stderr = normalize_diagnostics(stderr);
     let status_label = if status.success() {
         "success"
     } else {
@@ -80,3 +80,58 @@ fn normalize_durations(input: &str) -> String {
     }
     content
 }
+
+fn normalize_diagnostics(input: &str) -> String {
+    let normalized = normalize_durations(input);
+    let mut lines = normalized.lines().peekable();
+    let mut diagnostic_sections: Vec<String> = Vec::new();
+    let mut other_lines: Vec<String> = Vec::new();
+
+    while let Some(line) = lines.next() {
+        if is_path_line(line) {
+            let mut block = String::from(line);
+            while let Some(&next) = lines.peek() {
+                if is_path_line(next) || next.starts_with("check ") {
+                    break;
+                }
+                block.push('\n');
+                block.push_str(next);
+                lines.next();
+            }
+            diagnostic_sections.push(trim_trailing_newlines(block));
+        } else {
+            other_lines.push(line.to_string());
+        }
+    }
+
+    diagnostic_sections.sort();
+
+    let mut parts = Vec::new();
+    if !diagnostic_sections.is_empty() {
+        parts.push(diagnostic_sections.join("\n\n"));
+    }
+
+    let rest = trim_trailing_newlines(other_lines.join("\n"));
+    if rest.trim().is_empty() {
+        parts.join("\n\n")
+    } else if parts.is_empty() {
+        rest
+    } else {
+        parts.push(rest);
+        parts.join("\n\n")
+    }
+}
+
+fn is_path_line(line: &str) -> bool {
+    let trimmed = line.trim_start();
+    (trimmed.starts_with("./") || trimmed.starts_with("tests/"))
+        && trimmed.contains(':')
+        && trimmed.contains(" syntax")
+}
+
+fn trim_trailing_newlines(mut value: String) -> String {
+    while value.ends_with('\n') {
+        value.pop();
+    }
+    value
+}

crates/pgt_cli/tests/commands/check.rs

@@ -68,7 +68,7 @@ fn normalize_durations(input: &str) -> String {
 
 fn normalize_output(status: ExitStatus, stdout: &str, stderr: &str) -> String {
     let normalized_stdout = normalize_durations(stdout);
-    let normalized_stderr = normalize_durations(stderr);
+    let normalized_stderr = normalize_diagnostics(stderr);
     let status_label = if status.success() {
         "success"
     } else {
@@ -81,6 +81,61 @@ fn normalize_output(status: ExitStatus, stdout: &str, stderr: &str) -> String {
     )
 }
 
+fn normalize_diagnostics(input: &str) -> String {
+    let normalized = normalize_durations(input);
+    let mut lines = normalized.lines().peekable();
+    let mut diagnostic_sections: Vec<String> = Vec::new();
+    let mut other_lines: Vec<String> = Vec::new();
+
+    while let Some(line) = lines.next() {
+        if is_path_line(line) {
+            let mut block = String::from(line);
+            while let Some(&next) = lines.peek() {
+                if is_path_line(next) || next.starts_with("check ") {
+                    break;
+                }
+                block.push('\n');
+                block.push_str(next);
+                lines.next();
+            }
+            diagnostic_sections.push(trim_trailing_newlines(block));
+        } else {
+            other_lines.push(line.to_string());
+        }
+    }
+
+    diagnostic_sections.sort();
+
+    let mut parts = Vec::new();
+    if !diagnostic_sections.is_empty() {
+        parts.push(diagnostic_sections.join("\n\n"));
+    }
+
+    let rest = trim_trailing_newlines(other_lines.join("\n"));
+    if rest.trim().is_empty() {
+        parts.join("\n\n")
+    } else if parts.is_empty() {
+        rest
+    } else {
+        parts.push(rest);
+        parts.join("\n\n")
+    }
+}
+
+fn is_path_line(line: &str) -> bool {
+    let trimmed = line.trim_start();
+    (trimmed.starts_with("./") || trimmed.starts_with("tests/"))
+        && trimmed.contains(':')
+        && trimmed.contains(" syntax")
+}
+
+fn trim_trailing_newlines(mut value: String) -> String {
+    while value.ends_with('\n') {
+        value.pop();
+    }
+    value
+}
+
 #[test]
 #[cfg_attr(
     target_os = "windows",

crates/pgt_cli/tests/commands/snapshots/main__commands__check__check_directory_traversal_snapshot.snap

@@ -8,21 +8,21 @@ stdout:
 Checked 2 files in <duration>. No fixes applied.
 Found 2 errors.
 stderr:
-./bad.sql:1:1 syntax ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+./another_bad.sql:1:1 syntax ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   × Invalid statement: syntax error at or near "tqjable"
 
-  > 1 │ alter tqjable bad drop column id;
-      │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  > 1 │ alter tqjable another drop column id;
+      │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     2 │ 
 
 
-./another_bad.sql:1:1 syntax ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+./bad.sql:1:1 syntax ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   × Invalid statement: syntax error at or near "tqjable"
 
-  > 1 │ alter tqjable another drop column id;
-      │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  > 1 │ alter tqjable bad drop column id;
+      │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     2 │