Fix empty lines bug

rhaiscript · Mar 25, 2024 · 08ff3c0 · 08ff3c0
1 parent ef2a63d
commit 08ff3c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/bin/rhai-dbg.rs b/src/bin/rhai-dbg.rs
@@ -84,7 +84,8 @@ fn print_current_source(
 
 /// Pretty-print error.
 fn print_error(input: &str, mut err: EvalAltResult) {
-    let lines: Vec<_> = input.trim().lines().collect();
+    // Do not use `line` because it "eats" the last empty line if the script ends with a newline.
+    let lines: Vec<_> = input.split('\n').collect();
     let pos = err.take_position();
 
     let line_no = if lines.len() > 1 {

diff --git a/src/bin/rhai-repl.rs b/src/bin/rhai-repl.rs
@@ -11,7 +11,8 @@ const HISTORY_FILE: &str = ".rhai-repl-history";
 
 /// Pretty-print error.
 fn print_error(input: &str, mut err: EvalAltResult) {
-    let lines: Vec<_> = input.lines().collect();
+    // Do not use `line` because it "eats" the last empty line if the script ends with a newline.
+    let lines: Vec<_> = input.split('\n').collect();
     let pos = err.take_position();
 
     let line_no = if lines.len() > 1 {

diff --git a/src/bin/rhai-run.rs b/src/bin/rhai-run.rs
@@ -20,7 +20,8 @@ fn eprint_error(input: &str, mut err: EvalAltResult) {
         eprintln!();
     }
 
-    let lines: Vec<_> = input.lines().collect();
+    // Do not use `line` because it "eats" the last empty line if the script ends with a newline.
+    let lines: Vec<_> = input.split('\n').collect();
 
     // Print error
     let pos = err.take_position();