Shape if needed to process left/right commands

pop-os · Nov 14, 2023 · 56f71ef · 56f71ef
1 parent abf5827
commit 56f71ef
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/edit/editor.rs b/src/edit/editor.rs
@@ -445,9 +445,9 @@ impl Edit for Editor {
                 self.cursor_x_opt = None;
             }
             Action::Left => {
-                let rtl_opt = self.buffer.lines[self.cursor.line]
-                    .shape_opt()
-                    .as_ref()
+                let rtl_opt = self
+                    .buffer
+                    .line_shape(font_system, self.cursor.line)
                     .map(|shape| shape.rtl);
                 if let Some(rtl) = rtl_opt {
                     if rtl {
@@ -458,9 +458,9 @@ impl Edit for Editor {
                 }
             }
             Action::Right => {
-                let rtl_opt = self.buffer.lines[self.cursor.line]
-                    .shape_opt()
-                    .as_ref()
+                let rtl_opt = self
+                    .buffer
+                    .line_shape(font_system, self.cursor.line)
                     .map(|shape| shape.rtl);
                 if let Some(rtl) = rtl_opt {
                     if rtl {
@@ -878,9 +878,9 @@ impl Edit for Editor {
                 self.cursor_x_opt = None;
             }
             Action::LeftWord => {
-                let rtl_opt = self.buffer.lines[self.cursor.line]
-                    .shape_opt()
-                    .as_ref()
+                let rtl_opt = self
+                    .buffer
+                    .line_shape(font_system, self.cursor.line)
                     .map(|shape| shape.rtl);
                 if let Some(rtl) = rtl_opt {
                     if rtl {
@@ -891,9 +891,9 @@ impl Edit for Editor {
                 }
             }
             Action::RightWord => {
-                let rtl_opt = self.buffer.lines[self.cursor.line]
-                    .shape_opt()
-                    .as_ref()
+                let rtl_opt = self
+                    .buffer
+                    .line_shape(font_system, self.cursor.line)
                     .map(|shape| shape.rtl);
                 if let Some(rtl) = rtl_opt {
                     if rtl {