diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index cc8b23d2a0e..52cd7bc9fcd 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -2073,14 +2073,14 @@ impl ProjectPanel { }; let filename = self.filename_editor.read(cx).text(cx); if !filename.is_empty() { - if filename.is_empty() { + let trimmed_filename = filename.trim(); + if trimmed_filename.is_empty() { edit_state.validation_state = ValidationState::Error("File or directory name cannot be empty.".to_string()); cx.notify(); return; } - let trimmed_filename = filename.trim(); if trimmed_filename != filename { edit_state.validation_state = ValidationState::Warning( "File or directory name contains leading or trailing whitespace.".to_string(), diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs index d995cd66404..084c9188f76 100644 --- a/crates/project_panel/src/project_panel_tests.rs +++ b/crates/project_panel/src/project_panel_tests.rs @@ -1215,7 +1215,40 @@ async fn test_editing_files(cx: &mut gpui::TestAppContext) { panel.filename_editor.update(cx, |editor, cx| { editor.set_text(" ", window, cx); }); + }); + panel.update_in(cx, |panel, window, cx| { + let validation_state = panel + .state + .edit_state + .as_ref() + .map(|edit_state| &edit_state.validation_state); + assert!( + matches!( + validation_state, + Some(ValidationState::Error(message)) + if message == "File or directory name cannot be empty." + ), + "Unexpected validation state: {validation_state:?}" + ); assert!(panel.confirm_edit(true, window, cx).is_none()); + panel.filename_editor.update(cx, |editor, cx| { + editor.set_text(" a ", window, cx); + }); + }); + panel.update_in(cx, |panel, window, cx| { + let validation_state = panel + .state + .edit_state + .as_ref() + .map(|edit_state| &edit_state.validation_state); + assert!( + matches!( + validation_state, + Some(ValidationState::Warning(message)) + if message == "File or directory name contains leading or trailing whitespace." + ), + "Unexpected validation state: {validation_state:?}" + ); panel.cancel(&menu::Cancel, window, cx); }); cx.run_until_parked();