From 8fa591ae3d53bb3ad124855ee97fc4fb8bcea5f8 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 17 Feb 2022 00:18:32 -0500 Subject: [PATCH] fix: position update --- src/children.rs | 2 +- src/config.rs | 2 +- src/position.rs | 2 +- tests/cases/root/out | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/children.rs b/src/children.rs index a1e5a7f..398d7f4 100644 --- a/src/children.rs +++ b/src/children.rs @@ -225,7 +225,7 @@ fn dedent_comment(pos: &crate::position::Position, text: &str) -> String { lines[0] = "".to_string(); } else { lines.insert(0, format!("{0:<1$}", "", pos.column + 1)); - lines[1] = format!("{0:<1$}{2}", "", pos.column + 1, lines[1]); + lines[1] = format!("{0:<1$}{2}", "", pos.column + 2, lines[1]); } // println!("{:?}", lines); diff --git a/src/config.rs b/src/config.rs index 10205b3..4bfd9ae 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,4 +1,4 @@ -#[derive(Clone)] +#[derive(Clone, Debug)] pub enum Layout { Tall, Wide, diff --git a/src/position.rs b/src/position.rs index 1be2414..6dfb247 100644 --- a/src/position.rs +++ b/src/position.rs @@ -17,7 +17,7 @@ impl Position { self.column = 0 } self.column += match chars.iter().rposition(|c| *c == '\n') { - Some(pos) => chars.len() - pos, + Some(pos) => chars.len() - pos - 1, None => chars.len(), }; } diff --git a/tests/cases/root/out b/tests/cases/root/out index ea4d594..9810a89 100644 --- a/tests/cases/root/out +++ b/tests/cases/root/out @@ -1,6 +1,6 @@ /* Some functions f - name attribute. + name attribute. */ /* Add to or over