From 3eb829e2330fed5ad1c095f8bba44f62361b4943 Mon Sep 17 00:00:00 2001
From: Ivan Tham
Date: Wed, 3 Nov 2021 11:02:29 +0800
Subject: Ensure coords in screen depends on char width (#885)

The issue affected files with lots of tabs at the start as well.

Fix #840---
 helix-view/src/view.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'helix-view/src')

diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 01f18c71..11f30155 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -2,10 +2,9 @@ use std::borrow::Cow;
 
 use crate::{graphics::Rect, Document, DocumentId, ViewId};
 use helix_core::{
-    coords_at_pos,
     graphemes::{grapheme_width, RopeGraphemes},
     line_ending::line_end_char_index,
-    Position, RopeSlice, Selection,
+    visual_coords_at_pos, Position, RopeSlice, Selection,
 };
 
 type Jump = (DocumentId, Selection);
@@ -91,7 +90,10 @@ impl View {
             .selection(self.id)
             .primary()
             .cursor(doc.text().slice(..));
-        let Position { col, row: line } = coords_at_pos(doc.text().slice(..), cursor);
+
+        let Position { col, row: line } =
+            visual_coords_at_pos(doc.text().slice(..), cursor, doc.tab_width());
+
         let inner_area = self.inner_area();
         let last_line = (self.offset.row + inner_area.height as usize).saturating_sub(1);
 
-- 
cgit v1.2.3-70-g09d2