Merge pull request #60 from amber-lang/59-bug-logger-panics

fix(logger): prevent logger from panicking
amber-lang · Aug 7, 2024 · 7701a75 · 7701a75
2 parents 0a4e5f1 + bf0baa4
commit 7701a75
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "heraclitus-compiler"
-version = "1.7.4"
+version = "1.7.5"
 edition = "2021"
 description = "Compiler frontend for developing great programming languages"
 license = "MIT"

diff --git a/README.md b/README.md
@@ -45,6 +45,10 @@ let tokens = cc.tokenize()?;
 
 # Change log 🚀
 
+## Version 1.7.5
+### Fix:
+- Prevent Logger from panicking when trying to display a region that is out of bounds
+
 ## Version 1.7.4
 ### Fix:
 - `Logger::text` now doesn't end with a new line

diff --git a/src/compiling/failing/logger.rs b/src/compiling/failing/logger.rs
@@ -155,7 +155,7 @@ impl Logger {
             if col - 1 + len > code.chars().count() {
                 // We substract here 2 because 1 is the offset of col (starts at 1)
                 // and other 1 is the new line character that we do not display
-                *overflow = col - 2 + len - code.chars().count();
+                *overflow = (col - 2 + len).checked_sub(code.chars().count()).unwrap_or(0);
             }
             Some(format!("{line}| {formatted}"))
         }