Merge pull request #1391 from zed-industries/dismiss-project-panel-rename

Max Brunsfeld created 3 years ago

Dismiss project panel's rename editor when it loses focus

Change summary

crates/project_panel/src/project_panel.rs | 49 +++++++++++++++++++++++++
1 file changed, 49 insertions(+)

Detailed changes

crates/project_panel/src/project_panel.rs

@@ -184,6 +184,20 @@ impl ProjectPanel {
                 )
             });
 
+            cx.observe_focus(&filename_editor, |this, _, is_focused, cx| {
+                if !is_focused {
+                    if this
+                        .edit_state
+                        .as_ref()
+                        .map_or(false, |state| state.processing_filename.is_none())
+                    {
+                        this.edit_state = None;
+                        this.update_visible_entries(None, cx);
+                    }
+                }
+            })
+            .detach();
+
             let mut this = Self {
                 project: project.clone(),
                 list: Default::default(),
@@ -1544,6 +1558,41 @@ mod tests {
                 "      .dockerignore",
             ]
         );
+
+        panel.update(cx, |panel, cx| panel.rename(&Default::default(), cx));
+        assert_eq!(
+            visible_entries_as_strings(&panel, 0..10, cx),
+            &[
+                "v root1",
+                "    > .git",
+                "    > a",
+                "    v b",
+                "        > [EDITOR: '3']  <== selected",
+                "        > 4",
+                "        > new-dir",
+                "          a-different-filename",
+                "    > C",
+                "      .dockerignore",
+            ]
+        );
+
+        // Dismiss the rename editor when it loses focus.
+        workspace.update(cx, |_, cx| cx.focus_self());
+        assert_eq!(
+            visible_entries_as_strings(&panel, 0..10, cx),
+            &[
+                "v root1",
+                "    > .git",
+                "    > a",
+                "    v b",
+                "        > 3  <== selected",
+                "        > 4",
+                "        > new-dir",
+                "          a-different-filename",
+                "    > C",
+                "      .dockerignore",
+            ]
+        );
     }
 
     fn toggle_expand_dir(