Fix const name

1 files changed, 25 insertions, 20 deletions

diff --git a/src/run.rs b/src/run.rs
index 44cbace..5e8384c 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -25,8 +25,8 @@ const SESSION_FILE: &str = ".session";
 /// Where the item list starts to scroll.
 const SCROLL_POINT: u16 = 3;
 const CLRSCR: &str = "\x1B[2J";
-const INITIAL_POS_SEARCH: u16 = 3;
-const INITIAL_POS_SHELL: u16 = 3;
+const INITIAL_POS_COMMAND_LINE: u16 = 3;
+const INITIAL_POS_Z: u16 = 2;
 
 /// Launch the app. If initialization goes wrong, return error.
 pub fn run(arg: PathBuf, log: bool) -> Result<(), FxError> {
@@ -623,7 +623,6 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                 let mut command: Vec<char> = vec!['z'];
                                 screen.flush()?;
 
-                                let initial_pos = 2;
                                 let mut current_pos = 3;
                                 'zoxide: loop {
                                     if let Event::Key(KeyEvent { code, .. }) = event::read()? {
@@ -636,7 +635,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                             }
 
                                             KeyCode::Left => {
-                                                if current_pos == initial_pos {
+                                                if current_pos == INITIAL_POS_Z {
                                                     continue;
                                                 };
                                                 current_pos -= 1;
@@ -645,7 +644,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
 
                                             KeyCode::Right => {
                                                 if current_pos as usize
-                                                    == command.len() + initial_pos as usize
+                                                    == command.len() + INITIAL_POS_Z as usize
                                                 {
                                                     continue;
                                                 };
@@ -654,14 +653,15 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                             }
 
                                             KeyCode::Backspace => {
-                                                if current_pos == initial_pos + 1 {
+                                                if current_pos == INITIAL_POS_Z + 1 {
                                                     go_to_info_line_and_reset();
                                                     hide_cursor();
                                                     state.move_cursor(state.layout.y);
                                                     break 'zoxide;
                                                 };
-                                                command
-                                                    .remove((current_pos - initial_pos - 1).into());
+                                                command.remove(
+                                                    (current_pos - INITIAL_POS_Z - 1).into(),
+                                                );
                                                 current_pos -= 1;
 
                                                 clear_current_line();
@@ -746,8 +746,10 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                             }
 
                                             KeyCode::Char(c) => {
-                                                command
-                                                    .insert((current_pos - initial_pos).into(), c);
+                                                command.insert(
+                                                    (current_pos - INITIAL_POS_Z).into(),
+                                                    c,
+                                                );
                                                 current_pos += 1;
                                                 clear_current_line();
                                                 to_info_line();
@@ -779,7 +781,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                 let mut new_name: Vec<char> = Vec::new();
 
                                 // express position in terminal
-                                let mut current_pos = INITIAL_POS_SHELL;
+                                let mut current_pos = INITIAL_POS_COMMAND_LINE;
                                 // express position in Vec<Char>
                                 let mut current_char_pos = 0;
                                 'insert: loop {
@@ -1295,7 +1297,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                 let mut keyword: Vec<char> = Vec::new();
 
                                 // express position in terminal
-                                let mut current_pos = INITIAL_POS_SEARCH;
+                                let mut current_pos = INITIAL_POS_COMMAND_LINE;
                                 // express position in Vec<Char>
                                 let mut current_char_pos = 0;
                                 loop {
@@ -1501,7 +1503,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
 
                                 let mut command: Vec<char> = Vec::new();
 
-                                let mut current_pos = INITIAL_POS_SHELL;
+                                let mut current_pos = INITIAL_POS_COMMAND_LINE;
                                 'reg: loop {
                                     if let Event::Key(KeyEvent { code, .. }) = event::read()? {
                                         match code {
@@ -1513,7 +1515,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                             }
 
                                             KeyCode::Left => {
-                                                if current_pos == INITIAL_POS_SHELL {
+                                                if current_pos == INITIAL_POS_COMMAND_LINE {
                                                     continue;
                                                 };
                                                 current_pos -= 1;
@@ -1522,7 +1524,8 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
 
                                             KeyCode::Right => {
                                                 if current_pos as usize
-                                                    == command.len() + INITIAL_POS_SHELL as usize
+                                                    == command.len()
+                                                        + INITIAL_POS_COMMAND_LINE as usize
                                                 {
                                                     continue;
                                                 };
@@ -1531,15 +1534,17 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                             }
 
                                             KeyCode::Backspace => {
-                                                if current_pos == INITIAL_POS_SHELL {
+                                                if current_pos == INITIAL_POS_COMMAND_LINE {
                                                     go_to_info_line_and_reset();
                                                     hide_cursor();
                                                     state.move_cursor(state.layout.y);
                                                     break 'reg;
                                                 } else {
                                                     command.remove(
-                                                        (current_pos - INITIAL_POS_SHELL - 1)
-                                                            .into(),
+                                                        (current_pos
+                                                            - INITIAL_POS_COMMAND_LINE
+                                                            - 1)
+                                                        .into(),
                                                     );
                                                     current_pos -= 1;
 
@@ -1555,7 +1560,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
 
                                             KeyCode::Char(c) => {
                                                 command.insert(
-                                                    (current_pos - INITIAL_POS_SHELL).into(),
+                                                    (current_pos - INITIAL_POS_COMMAND_LINE).into(),
                                                     c,
                                                 );
                                                 if ((state.v_start.is_some() || c == 'p')
@@ -1873,7 +1878,7 @@ fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
                                 let mut command: Vec<char> = Vec::new();
 
                                 // express position in terminal
-                                let mut current_pos = INITIAL_POS_SHELL;
+                                let mut current_pos = INITIAL_POS_COMMAND_LINE;
                                 // express position in Vec<Char>
                                 let mut current_char_pos = 0;
                                 'command: loop {