Fix subtraction with overflow in some assertions (#14)

Author: mondeja

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.3.3
+    rev: v3.4.2
     hooks:
       - id: prettier
         args:
@@ -14,14 +14,14 @@ repos:
       - id: check-useless-excludes
         name: check-useless-excludes
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         name: trailing-whitespace
       - id: end-of-file-fixer
         name: end-of-file-fixer
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.13.0
+    rev: v0.17.1
     hooks:
       - id: markdownlint-cli2
         exclude: ^LICENSE$
@@ -34,12 +34,8 @@ repos:
         name: clippy-no-features
         args:
           [
-            --exclude=leptos-fluent-ssr-hydrate-axum-example,
-            --workspace,
             --,
             -D,
-            warnings,
-            -D,
             clippy::perf,
             -D,
             clippy::print_stdout,
@@ -51,7 +47,7 @@ repos:
             clippy::semicolon_if_nothing_returned,
           ]
   - repo: https://github.com/mondeja/rust-pc-hooks
-    rev: v1.2.0
+    rev: v1.3.0
     hooks:
       - id: cargo-machete
         args:

CHANGELOG.md

@@ -1,10 +1,16 @@
 # CHANGELOG
 
+## 2025-01-13 - [0.2.2]
+
+### Bug fixes
+
+- Fix substraction with overflow formatting some assertions.
+
 ## 2024-11-13 - [0.2.1]
 
 ### Bug fixes
 
-- Set exitcode 2 when CLI detects possible changes for files. 
+- Set exitcode 2 when CLI detects possible changes for files.
 
 ## 2024-10-18 - [0.2.0]
 
@@ -60,6 +66,7 @@
 
 First beta release
 
+[0.2.2]: https://github.com/mondeja/hledger-fmt/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/mondeja/hledger-fmt/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/mondeja/hledger-fmt/compare/v0.1.4...v0.2.0
 [0.1.4]: https://github.com/mondeja/hledger-fmt/compare/v0.1.3...v0.1.4

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hledger-fmt"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "An opinionated hledger's journal files formatter."
 repository = "https://github.com/mondeja/hledger-fmt"

Cargo.toml

@@ -187,11 +187,17 @@ pub fn format_content(nodes: &JournalFile) -> String {
                                                 value_second_part_units,
                                             )
                                     } else {
-                                        2 + max_entry_value_first_part_commodity_trailing_len
-                                            - value_first_part_decimal.chars().count()
-                                            - trailing_commodity_len_from_units(
+                                        let pos =
+                                            2 + max_entry_value_first_part_commodity_trailing_len;
+                                        let neg = value_first_part_decimal.chars().count()
+                                            + trailing_commodity_len_from_units(
                                                 value_first_part_units,
-                                            )
+                                            );
+                                        if pos > neg {
+                                            pos - neg
+                                        } else {
+                                            2
+                                        }
                                     })
                                 } else {
                                     "".to_string()

src/formatter/mod.rs

@@ -460,3 +460,19 @@ fn complex_transaction() {
 "#,
     );
 }
+
+#[test]
+fn issue_13() {
+    assert_format(
+        r#"
+2022-01-01 SHELL OIL
+    asset:checking           $-8.42 = $11373.17
+    expense:transport:gas           $8.42
+"#,
+        r#"
+2022-01-01 SHELL OIL
+    asset:checking         $-8.42  =  $11373.17
+    expense:transport:gas   $8.42
+"#,
+    );
+}

src/formatter/tests.rs

@@ -278,7 +278,7 @@ pub fn parse_content(content: &str) -> Result<JournalFile, errors::SyntaxError>
                         state = ParserState::MultilineComment;
                         data.multiline_comment_start_lineno = lineno + 1;
                         data.multiline_comment_content = String::new();
-                    } else if colno == 0 && line.chars().map(char::is_whitespace).all(|x| x) {
+                    } else if colno == 0 && line.chars().all(char::is_whitespace) {
                         process_empty_line(lineno + 1, &mut journal, &mut data);
                     } else if colno == 0
                         && (line.starts_with("account ")