Fix substraction with overflow (#28)

Author: mondeja

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 2025-06-13 - [0.2.9]
+
+### Bug fixes
+
+- Fix substraction with overflow formatting some entry values
+  with currencies with more than 3 characters.
+
 ## 2025-05-20 - [0.2.8]
 
 ### Bug fixes
@@ -108,6 +115,7 @@
 
 First beta release
 
+[0.2.9]: https://github.com/mondeja/hledger-fmt/compare/v0.2.8...v0.2.9
 [0.2.8]: https://github.com/mondeja/hledger-fmt/compare/v0.2.7...v0.2.8
 [0.2.7]: https://github.com/mondeja/hledger-fmt/compare/v0.2.6...v0.2.7
 [0.2.6]: https://github.com/mondeja/hledger-fmt/compare/v0.2.5...v0.2.6

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hledger-fmt"
-version = "0.2.8"
+version = "0.2.9"
 rust-version = "1.74.1"
 edition = "2021"
 description = "An opinionated hledger's journal files formatter."

Cargo.toml

@@ -38,7 +38,7 @@ pub fn run(cmd: clap::Command) -> i32 {
                     "{}",
                     // Rewrite without concatenation
                     "No hledger journal files found in the current directory nor its subdirectories.\n\
-                    Ensure that have extensions '.hledger', '.journal' or '.j."
+                    Ensure that have extensions '.hledger', '.journal' or '.j'."
                 );
                 exitcode = 1;
                 return exitcode;
@@ -219,7 +219,7 @@ fn gather_files_from_directory_and_subdirectories(
                                 .contains(&ext)
                                 {
                                     let file_path = path.to_str().unwrap();
-                                    let maybe_file_content = read_file(&file_path);
+                                    let maybe_file_content = read_file(file_path);
                                     if let Ok(content) = maybe_file_content {
                                         files.push((file_path.to_string(), content));
                                     } else {

src/cli/mod.rs

@@ -118,7 +118,8 @@ pub(crate) fn format_content_with_options(
                 max_entry_value_first_part_commodity_trailing_len,
                 max_entry_value_first_separator_len,
                 max_entry_value_second_part_decimal_len,
-                max_entry_value_second_part_numeric_units_len,
+                max_entry_value_second_part_units_len,
+                max_entry_value_second_part_commodity_leading_len,
                 max_entry_value_second_separator_len,
                 max_entry_value_third_part_decimal_len,
                 max_entry_value_third_part_numeric_units_len,
@@ -193,15 +194,26 @@ pub(crate) fn format_content_with_options(
                                 if !value_second_part_units.is_empty()
                                     || !value_second_part_decimal.is_empty()
                                 {
-                                    " ".repeat(
-                                        3 + max_entry_value_first_separator_len
-                                            - value_first_separator.len()
+                                    " ".repeat({
+                                        let value_first_separator_len = value_first_separator.len();
+                                        let n = 3 + (*max_entry_value_first_separator_len as i32)
+                                            - value_first_separator_len as i32
                                             - leading_commodity_len_from_units(
                                                 value_second_part_units,
-                                            )
-                                            + max_entry_value_second_part_numeric_units_len
-                                            - value_second_part_numeric_units.chars().count(),
-                                    )
+                                            ) as i32
+                                            + (*max_entry_value_second_part_units_len as i32)
+                                            - value_second_part_numeric_units.chars().count()
+                                                as i32
+                                            - (*max_entry_value_second_part_commodity_leading_len
+                                                as i32);
+
+                                        if n > 3 {
+                                            n as usize
+                                        } else {
+                                            3 + max_entry_value_first_separator_len
+                                                - value_first_separator_len
+                                        }
+                                    })
                                 } else {
                                     "".to_string()
                                 },

src/formatter/mod.rs

@@ -330,8 +330,8 @@ fn transaction_with_shares() {
 "#,
         r#"
 2024-01-15 buy some shares, in two lots  ; Cost can be noted.
-    assets:investments:2024-01-15       2.0 AAAA   @   $1.50  ; @  means per-unit cost
-    assets:investments:2024-01-15-02    3.0 AAAA   @@  $4     ; @@ means total cost
+    assets:investments:2024-01-15       2.0 AAAA   @    $1.50  ; @  means per-unit cost
+    assets:investments:2024-01-15-02    3.0 AAAA   @@   $4     ; @@ means total cost
     ; ^ Per-lot subaccounts are sometimes useful.
     assets:checking                   $-7
 "#,
@@ -492,7 +492,7 @@ fn lots() {
 }
 
 #[test]
-fn issue25() {
+fn issue_25() {
     assert_format(
         r#"1/1/1 * transaction
 	; vacation  $2350 hawaii flight
@@ -502,3 +502,17 @@ fn issue25() {
 "#,
     );
 }
+
+#[test]
+fn issue_27() {
+    assert_format(
+        r#"2024-01-02 exchange imaginary currency
+    income:cash    EUR -100 @@ USDT 120
+    assets:cash    USDT 120
+"#,
+        r#"2024-01-02 exchange imaginary currency
+    income:cash  EUR-100   @@   USDT120
+    assets:cash  USDT120
+"#,
+    )
+}

src/formatter/tests.rs

@@ -65,7 +65,8 @@ pub enum JournalCstNode {
         max_entry_value_first_part_commodity_trailing_len: usize,
         max_entry_value_first_separator_len: usize,
         max_entry_value_second_part_decimal_len: usize,
-        max_entry_value_second_part_numeric_units_len: usize,
+        max_entry_value_second_part_units_len: usize,
+        max_entry_value_second_part_commodity_leading_len: usize,
         max_entry_value_second_separator_len: usize,
         max_entry_value_third_part_decimal_len: usize,
         max_entry_value_third_part_numeric_units_len: usize,
@@ -198,7 +199,8 @@ struct ParserTempData {
     max_entry_value_first_part_commodity_trailing_len: usize,
     max_entry_value_first_separator_len: usize,
     max_entry_value_second_part_decimal_len: usize,
-    max_entry_value_second_part_numeric_units_len: usize,
+    max_entry_value_second_part_units_len: usize,
+    max_entry_value_second_part_commodity_leading_len: usize,
     max_entry_value_second_separator_len: usize,
     max_entry_value_third_part_decimal_len: usize,
     max_entry_value_third_part_numeric_units_len: usize,
@@ -225,7 +227,8 @@ impl ParserTempData {
             max_entry_value_first_part_commodity_trailing_len: 0,
             max_entry_value_first_separator_len: 0,
             max_entry_value_second_part_decimal_len: 0,
-            max_entry_value_second_part_numeric_units_len: 0,
+            max_entry_value_second_part_units_len: 0,
+            max_entry_value_second_part_commodity_leading_len: 0,
             max_entry_value_second_separator_len: 0,
             max_entry_value_third_part_decimal_len: 0,
             max_entry_value_third_part_numeric_units_len: 0,
@@ -525,9 +528,12 @@ pub fn parse_content(content: &str) -> Result<JournalFile, errors::SyntaxError>
                             data.max_entry_value_second_part_decimal_len = data
                                 .max_entry_value_second_part_decimal_len
                                 .max(p.second_part_decimal.chars().count());
-                            data.max_entry_value_second_part_numeric_units_len = data
-                                .max_entry_value_second_part_numeric_units_len
-                                .max(p.second_part_numeric_units.len());
+                            data.max_entry_value_second_part_units_len = data
+                                .max_entry_value_second_part_units_len
+                                .max(p.second_part_units.chars().count());
+                            data.max_entry_value_second_part_commodity_leading_len = data
+                                .max_entry_value_second_part_commodity_leading_len
+                                .max(leading_commodity_len_from_units(&p.second_part_units));
 
                             data.max_entry_value_second_separator_len = data
                                 .max_entry_value_second_separator_len
@@ -776,8 +782,9 @@ fn save_transaction(data: &mut ParserTempData, journal: &mut Vec<JournalCstNode>
             .max_entry_value_first_part_commodity_trailing_len,
         max_entry_value_first_separator_len: data.max_entry_value_first_separator_len,
         max_entry_value_second_part_decimal_len: data.max_entry_value_second_part_decimal_len,
-        max_entry_value_second_part_numeric_units_len: data
-            .max_entry_value_second_part_numeric_units_len,
+        max_entry_value_second_part_units_len: data.max_entry_value_second_part_units_len,
+        max_entry_value_second_part_commodity_leading_len: data
+            .max_entry_value_second_part_commodity_leading_len,
         max_entry_value_second_separator_len: data.max_entry_value_second_separator_len,
         max_entry_value_third_part_decimal_len: data.max_entry_value_third_part_decimal_len,
         max_entry_value_third_part_numeric_units_len: data
@@ -798,7 +805,8 @@ fn save_transaction(data: &mut ParserTempData, journal: &mut Vec<JournalCstNode>
     data.max_entry_value_first_part_commodity_trailing_len = 0;
     data.max_entry_value_first_separator_len = 0;
     data.max_entry_value_second_part_decimal_len = 0;
-    data.max_entry_value_second_part_numeric_units_len = 0;
+    data.max_entry_value_second_part_units_len = 0;
+    data.max_entry_value_second_part_commodity_leading_len = 0;
     data.max_entry_value_second_separator_len = 0;
     data.max_entry_value_third_part_decimal_len = 0;
     data.max_entry_value_third_part_numeric_units_len = 0;
@@ -1000,6 +1008,7 @@ impl EntryValueParser {
                     } else if !c.is_whitespace() {
                         second_part_value.push(c);
                         state = SecondPartCommodityBefore;
+                        current_spaces_in_a_row = 0;
                     }
                 }
                 SecondPartCommodityBefore => {
@@ -1235,7 +1244,7 @@ mod test {
     #[test]
     fn test_parser() {
         let mut parser = EntryValueParser::default();
-        _ = parser.parse("0.0 AAAA            =      2.0 AAAA @  $1.50");
+        _ = parser.parse("EUR -100 @@ USDT 120");
         println!("{:?}", parser);
         assert!(false);
     }