`c5090ec`

feat: add centered rename modal dialog

Replace the status bar text input for LSP rename with a sleek
centered modal dialog that shows:
- "Rename Symbol" title
- "From:" with the original symbol name
- "To:" with an editable input field

The modal provides better visibility and UX for the rename operation.

Authored by

espadonne 5 months ago

SHA: c5090ecf7775d7306802e3c2a4db717bcd1f0534
Parents: 15f5908
Tree: f91fb4c

2 changed files

Status	File	+	-
M	`src/editor/state.rs`	64	23
M	`src/render/screen.rs`	109	0

src/editor/state.rsmodified

      RestoreBackup,
      /// Text input prompt (label, current input buffer)
      TextInput { label: String, buffer: String, action: TextInputAction },
 +    /// LSP rename modal with original name shown
 +    RenameModal {
 +        original_name: String,
 +        new_name: String,
 +        path: String,
 +        line: u32,
 +        col: u32,
 +    },
+ }
  /// Action to perform when text input is complete
      GitCommit,
      /// Create a git tag
      GitTag,
 -    /// LSP rename symbol
 -    LspRename { path: String, line: u32, col: u32 },
+ }
  /// LSP UI state
                  String::new()
              };
 -            self.prompt = PromptState::TextInput {
 -                label: "Rename to: ".to_string(),
 -                buffer: current_word.clone(),
 -                action: TextInputAction::LspRename { path: path_str, line, col },
 +            if current_word.is_empty() {
 +                self.message = Some("No symbol under cursor".to_string());
 +                return;
 +            }
++
 +            self.prompt = PromptState::RenameModal {
 +                original_name: current_word.clone(),
 +                new_name: current_word,
 +                path: path_str,
 +                line,
 +                col,
              };
 -            self.message = Some(format!("Rename '{}' to: {}", current_word, current_word));
          } else {
              self.message = Some("No file open".to_string());
+         }
                  self.screen.render_server_manager_panel(&self.server_manager)?;
+             }
 +            // Render rename modal if active
 +            if let PromptState::RenameModal { ref original_name, ref new_name, .. } = self.prompt {
 +                self.screen.render_rename_modal(original_name, new_name)?;
 +            }
++
              // After all overlays are rendered, reposition cursor to the correct location
              // (overlays may have moved the terminal cursor position)
              let cursor = cursors.primary();
+                     }
+                 }
+             }
 +            PromptState::RenameModal { ref original_name, ref mut new_name, ref path, line, col } => {
 +                match key {
 +                    Key::Enter => {
 +                        // Clone values before modifying self.prompt
 +                        let original = original_name.clone();
 +                        let new = new_name.clone();
 +                        let path = path.clone();
++
 +                        // Execute rename
 +                        if new.is_empty() {
 +                            self.prompt = PromptState::None;
 +                            self.message = Some("Rename cancelled: empty name".to_string());
 +                        } else if new == original {
 +                            self.prompt = PromptState::None;
 +                            self.message = Some("Rename cancelled: name unchanged".to_string());
 +                        } else {
 +                            self.prompt = PromptState::None;
 +                            match self.workspace.lsp.request_rename(&path, line, col, &new) {
 +                                Ok(_id) => {
 +                                    self.message = Some(format!("Renaming '{}' to '{}'...", original, new));
 +                                }
 +                                Err(e) => {
 +                                    self.message = Some(format!("Rename failed: {}", e));
 +                                }
 +                            }
 +                        }
 +                    }
 +                    Key::Escape => {
 +                        self.prompt = PromptState::None;
 +                        self.message = Some("Rename cancelled".to_string());
 +                    }
 +                    Key::Backspace => {
 +                        new_name.pop();
 +                    }
 +                    Key::Char(c) => {
 +                        new_name.push(c);
 +                    }
 +                    _ => {}
 +                }
 +            }
              PromptState::None => {}
+         }
          Ok(())
                  let (_, msg) = self.workspace.fuss.git_tag(buffer);
                  self.message = Some(msg);
+             }
 -            TextInputAction::LspRename { path, line, col } => {
 -                if buffer.is_empty() {
 -                    self.message = Some("Rename cancelled: empty name".to_string());
 -                    return;
 -                }
 -                match self.workspace.lsp.request_rename(&path, line, col, buffer) {
 -                    Ok(_id) => {
 -                        self.message = Some(format!("Renaming to '{}'...", buffer));
 -                        // Note: The actual rename edits will be applied when we receive
 -                        // the response and implement WorkspaceEdit handling
 -                    }
 -                    Err(e) => {
 -                        self.message = Some(format!("Rename failed: {}", e));
 -                    }
 -                }
 -            }
+         }
+     }

src/render/screen.rsmodified

          Ok(())
+     }
 +    /// Render a centered rename modal dialog
 +    pub fn render_rename_modal(&mut self, original_name: &str, new_name: &str) -> Result<()> {
 +        let (width, height) = (self.cols, self.rows);
++
 +        // Calculate modal dimensions
 +        let title = "Rename Symbol";
 +        let from_label = "From: ";
 +        let to_label = "To:   ";
 +        let content_width = original_name.len().max(new_name.len()).max(20).max(title.len());
 +        let modal_width = content_width + 8; // padding + border
 +        let modal_height = 6; // title + from + to + bottom border + padding
++
 +        // Center the modal
 +        let start_col = ((width as usize).saturating_sub(modal_width)) / 2;
 +        let start_row = ((height as usize).saturating_sub(modal_height)) / 2;
++
 +        let bg = Color::AnsiValue(236);
 +        let border_color = Color::AnsiValue(244);
 +        let label_color = Color::AnsiValue(248);
 +        let value_color = Color::White;
 +        let input_bg = Color::AnsiValue(238);
++
 +        // Draw top border
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print(format!("┌{:─<width$}┐", "", width = modal_width - 2)),
 +        )?;
++
 +        // Draw title row
 +        let title_padding = (modal_width - 2 - title.len()) / 2;
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16 + 1),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print("│"),
 +            SetForegroundColor(Color::Cyan),
 +            Print(format!("{:>pad$}{}{:<rpad$}", "", title, "", pad = title_padding, rpad = modal_width - 2 - title_padding - title.len())),
 +            SetForegroundColor(border_color),
 +            Print("│"),
 +        )?;
++
 +        // Draw separator
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16 + 2),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print(format!("├{:─<width$}┤", "", width = modal_width - 2)),
 +        )?;
++
 +        // Draw "From:" row
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16 + 3),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print("│ "),
 +            SetForegroundColor(label_color),
 +            Print(from_label),
 +            SetForegroundColor(value_color),
 +            Print(format!("{:<width$}", original_name, width = modal_width - 4 - from_label.len())),
 +            SetForegroundColor(border_color),
 +            Print(" │"),
 +        )?;
++
 +        // Draw "To:" row with input field
 +        let input_width = modal_width - 4 - to_label.len();
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16 + 4),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print("│ "),
 +            SetForegroundColor(label_color),
 +            Print(to_label),
 +            SetBackgroundColor(input_bg),
 +            SetForegroundColor(Color::White),
 +            Print(format!("{:<width$}", new_name, width = input_width)),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print(" │"),
 +        )?;
++
 +        // Draw bottom border
 +        execute!(
 +            self.stdout,
 +            MoveTo(start_col as u16, start_row as u16 + 5),
 +            SetBackgroundColor(bg),
 +            SetForegroundColor(border_color),
 +            Print(format!("└{:─<width$}┘", "", width = modal_width - 2)),
 +            ResetColor,
 +        )?;
++
 +        // Position cursor in the input field
 +        let cursor_col = start_col + 2 + to_label.len() + new_name.len();
 +        execute!(
 +            self.stdout,
 +            MoveTo(cursor_col as u16, start_row as u16 + 4),
 +            SetBackgroundColor(input_bg),
 +            crossterm::cursor::Show,
 +        )?;
++
 +        Ok(())
 +    }
++
      /// Render the LSP server manager panel
      pub fn render_server_manager_panel(&mut self, panel: &ServerManagerPanel) -> Result<()> {
          if !panel.visible {