yagni

Author: pickx

src/core_editor/line_buffer.rs

@@ -90,6 +90,15 @@ impl LineBuffer {
         self.lines[..self.insertion_point].matches('\n').count()
     }
 
+    /// Calculates the character index in the line the user is on
+    ///
+    /// Zero-based index
+    pub fn col(&self) -> usize {
+        self.lines[self.line_start()..self.insertion_point]
+            .chars()
+            .count()
+    }
+
     /// Counts the number of lines in the buffer
     pub fn num_lines(&self) -> usize {
         self.lines.split('\n').count()

src/engine.rs

@@ -1,11 +1,7 @@
-use std::{
-    ffi::OsStr,
-    num::NonZeroUsize,
-    path::{Path, PathBuf},
-};
-
 use itertools::Itertools;
 use nu_ansi_term::{Color, Style};
+use std::ffi::OsStr;
+use std::path::PathBuf;
 
 use crate::{enums::ReedlineRawEvent, CursorConfig};
 #[cfg(feature = "bashisms")]
@@ -230,45 +226,6 @@ struct BufferEditor {
     temp_file: PathBuf,
 }
 
-/// a position in a buffer.
-/// indexes are one-based (hence the use of non-zero integer types)
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub(crate) struct BufferPosition {
-    pub line: NonZeroUsize,
-    pub col: NonZeroUsize,
-}
-
-impl BufferPosition {
-    fn from_editor(editor: &Editor) -> BufferPosition {
-        // TODO: this impl can probably be faster (caching newline locations?)
-
-        let buffer = editor.get_buffer();
-
-        let content_len = editor.insertion_point().min(buffer.len());
-        let content_until_cursor = &buffer[..content_len];
-
-        // impl note: see `core_editor::line_buffer::insert_newline`:
-        // we don't expect any other char sequence for linebreak.
-        let newline = '\n';
-
-        let line = {
-            let line_one_based = content_until_cursor.matches(newline).count() + 1;
-            NonZeroUsize::new(line_one_based).unwrap()
-        };
-
-        let col = {
-            let col_one_based = if let Some(newline_pos) = content_until_cursor.rfind(newline) {
-                content_until_cursor[newline_pos + 1..].chars().count() + 1
-            } else {
-                content_until_cursor.chars().count() + 1
-            };
-            NonZeroUsize::new(col_one_based).unwrap()
-        };
-
-        BufferPosition { line, col }
-    }
-}
-
 impl Drop for Reedline {
     fn drop(&mut self) {
         if self.cursor_shapes.is_some() {
@@ -1923,7 +1880,7 @@ impl Reedline {
     /// opens the current buffer in the editor described in [`buffer_editor`]
     /// returns the new buffer, after processing the changes via the editor
     fn open_editor(&self, buffer_editor: &BufferEditor) -> Result<String> {
-        let mut command = self.render_buffer_editor_command(buffer_editor);
+        let mut command = Self::render_editor_command(buffer_editor, self.editor.line_buffer());
 
         // flush buffer to temp file, so it can be read by the editor
         {
@@ -1941,11 +1898,13 @@ impl Reedline {
         Ok(buffer)
     }
 
-    /// renders the template command described in [`buffer_editor`], if any
-    fn render_buffer_editor_command(&self, buffer_editor: &BufferEditor) -> Command {
+    /// renders the template command described in [`buffer_editor`],
+    /// by substituting the placeholders in the pattern, if any
+    fn render_editor_command(buffer_editor: &BufferEditor, line_buffer: &LineBuffer) -> Command {
+        use std::ops::Add as _;
+
         let mut cmd = Command::new(buffer_editor.command.get_program());
 
-        // TODO: there are more efficient ways to do this.
         const FILE: &str = "{file}";
         const LINE: &str = "{line}";
         const COL: &str = "{col}";
@@ -1959,14 +1918,12 @@ impl Reedline {
             .any(|arg| arg.contains(FILE));
 
         if is_template {
-            let pos = BufferPosition::from_editor(&self.editor);
-
             // TODO: there are more efficient ways to do this.
             // e.g. "format args"-style structs
 
             let file = buffer_editor.temp_file.to_string_lossy();
-            let line = pos.line.to_string();
-            let col = pos.col.to_string();
+            let line = line_buffer.line().add(1).to_string();
+            let col = line_buffer.col().add(1).to_string();
 
             let actual_args = buffer_editor
                 .command