mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Keep showing edited filename in project panel while edit is in-progress

Browse source
This commit is contained in:
Max Brunsfeld 2022-05-04 13:03:50 -07:00
parent ff3cf3c0c3
commit 821dff0e2d
1 changed files with 111 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
crates/project_panel/src/project_panel.rs
View file

@ -44,11 +44,12 @@ struct Selection {
entry_id: ProjectEntryId, entry_id: ProjectEntryId,
} }
#[derive(Copy, Clone, Debug)] #[derive(Clone, Debug)]
struct EditState { struct EditState {
worktree_id: WorktreeId, worktree_id: WorktreeId,
entry_id: ProjectEntryId, entry_id: ProjectEntryId,
new_file: bool, new_file: bool,
processing_filename: Option<String>,
} }
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
@ -59,6 +60,7 @@ struct EntryDetails {
is_expanded: bool, is_expanded: bool,
is_selected: bool, is_selected: bool,
is_editing: bool, is_editing: bool,
is_processing: bool,
} }
#[derive(Clone)] #[derive(Clone)]
@ -127,12 +129,6 @@ impl ProjectPanel {
cx, cx,
) )
}); });
cx.subscribe(&filename_editor, |this, _, event, cx| {
if let editor::Event::Blurred = event {
this.editor_blurred(cx);
}
})
.detach();
let mut this = Self { let mut this = Self {
project: project.clone(), project: project.clone(),
@ -271,50 +267,57 @@ impl ProjectPanel {
} }
fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) -> Option<Task<Result<()>>> { fn confirm(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) -> Option<Task<Result<()>>> {
let edit_state = self.edit_state.take()?; let edit_state = self.edit_state.as_mut()?;
cx.focus_self(); cx.focus_self();
let worktree = self let worktree_id = edit_state.worktree_id;
.project let worktree = self.project.read(cx).worktree_for_id(worktree_id, cx)?;
.read(cx)
.worktree_for_id(edit_state.worktree_id, cx)?;
let entry = worktree.read(cx).entry_for_id(edit_state.entry_id)?.clone(); let entry = worktree.read(cx).entry_for_id(edit_state.entry_id)?.clone();
let filename = self.filename_editor.read(cx).text(cx); let filename = self.filename_editor.read(cx).text(cx);
let edit_task;
let edited_entry_id;
if edit_state.new_file { if edit_state.new_file {
let new_path = entry.path.join(filename); self.selection = Some(Selection {
let save = self.project.update(cx, |project, cx| { worktree_id,
entry_id: NEW_FILE_ENTRY_ID,
});
let new_path = entry.path.join(&filename);
edited_entry_id = NEW_FILE_ENTRY_ID;
edit_task = self.project.update(cx, |project, cx| {
project.create_file((edit_state.worktree_id, new_path), cx) project.create_file((edit_state.worktree_id, new_path), cx)
})?; })?;
Some(cx.spawn(|this, mut cx| async move {
let new_entry = save.await?;
this.update(&mut cx, |this, cx| {
this.update_visible_entries(Some((edit_state.worktree_id, new_entry.id)), cx);
cx.notify();
});
Ok(())
}))
} else { } else {
let old_path = entry.path.clone(); let new_path = if let Some(parent) = entry.path.clone().parent() {
let new_path = if let Some(parent) = old_path.parent() { parent.join(&filename)
parent.join(filename)
} else { } else {
filename.into() filename.clone().into()
}; };
edited_entry_id = entry.id;
let rename = self.project.update(cx, |project, cx| { edit_task = self.project.update(cx, |project, cx| {
project.rename_entry(entry.id, new_path, cx) project.rename_entry(entry.id, new_path, cx)
})?; })?;
};
Some(cx.spawn(|this, mut cx| async move { edit_state.processing_filename = Some(filename);
let new_entry = rename.await?; cx.notify();
this.update(&mut cx, |this, cx| {
this.update_visible_entries(Some((edit_state.worktree_id, new_entry.id)), cx); Some(cx.spawn(|this, mut cx| async move {
cx.notify(); let new_entry = edit_task.await?;
}); this.update(&mut cx, |this, cx| {
Ok(()) this.edit_state.take();
})) if let Some(selection) = &mut this.selection {
} if selection.entry_id == edited_entry_id {
selection.worktree_id = worktree_id;
selection.entry_id = new_entry.id;
}
}
this.update_visible_entries(None, cx);
cx.notify();
});
Ok(())
}))
} }
fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) { fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
@ -371,6 +374,7 @@ impl ProjectPanel {
worktree_id, worktree_id,
entry_id: directory_id, entry_id: directory_id,
new_file: true, new_file: true,
processing_filename: None,
}); });
self.filename_editor self.filename_editor
.update(cx, |editor, cx| editor.clear(cx)); .update(cx, |editor, cx| editor.clear(cx));
@ -392,6 +396,7 @@ impl ProjectPanel {
worktree_id, worktree_id,
entry_id, entry_id,
new_file: false, new_file: false,
processing_filename: None,
}); });
let filename = entry let filename = entry
.path .path
@ -409,13 +414,6 @@ impl ProjectPanel {
} }
} }
fn editor_blurred(&mut self, cx: &mut ViewContext<Self>) {
self.edit_state = None;
self.update_visible_entries(None, cx);
cx.focus_self();
cx.notify();
}
fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) { fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
if let Some(selection) = self.selection { if let Some(selection) = self.selection {
let (mut worktree_ix, mut entry_ix, _) = let (mut worktree_ix, mut entry_ix, _) =
@ -528,7 +526,7 @@ impl ProjectPanel {
} }
}; };
let new_file_parent_id = self.edit_state.and_then(|edit_state| { let new_file_parent_id = self.edit_state.as_ref().and_then(|edit_state| {
if edit_state.worktree_id == worktree_id && edit_state.new_file { if edit_state.worktree_id == worktree_id && edit_state.new_file {
Some(edit_state.entry_id) Some(edit_state.entry_id)
} else { } else {
@ -668,19 +666,28 @@ impl ProjectPanel {
e.worktree_id == snapshot.id() && e.entry_id == entry.id e.worktree_id == snapshot.id() && e.entry_id == entry.id
}), }),
is_editing: false, is_editing: false,
is_processing: false,
}; };
if let Some(edit_state) = self.edit_state { if let Some(edit_state) = &self.edit_state {
if edit_state.new_file { let is_edited_entry = if edit_state.new_file {
if entry.id == NEW_FILE_ENTRY_ID { entry.id == NEW_FILE_ENTRY_ID
details.is_editing = true;
details.filename.clear();
}
} else { } else {
if entry.id == edit_state.entry_id { entry.id == edit_state.entry_id
};
if is_edited_entry {
if let Some(processing_filename) = &edit_state.processing_filename {
details.is_processing = true;
details.filename.clear();
details.filename.push_str(&processing_filename);
} else {
if edit_state.new_file {
details.filename.clear();
}
details.is_editing = true; details.is_editing = true;
} }
}; }
} }
callback(entry.id, details, cx); callback(entry.id, details, cx);
} }
} }
@ -696,10 +703,11 @@ impl ProjectPanel {
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> ElementBox { ) -> ElementBox {
let kind = details.kind; let kind = details.kind;
let show_editor = details.is_editing && !details.is_processing;
MouseEventHandler::new::<Self, _, _>(entry_id.to_usize(), cx, |state, _| { MouseEventHandler::new::<Self, _, _>(entry_id.to_usize(), cx, |state, _| {
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width; let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
let style = theme.entry.style_for(state, details.is_selected); let style = theme.entry.style_for(state, details.is_selected);
let row_container_style = if details.is_editing { let row_container_style = if show_editor {
theme.filename_editor.container theme.filename_editor.container
} else { } else {
style.container style.container
@ -726,7 +734,7 @@ impl ProjectPanel {
.with_width(style.icon_size) .with_width(style.icon_size)
.boxed(), .boxed(),
) )
.with_child(if details.is_editing { .with_child(if show_editor {
ChildView::new(editor.clone()) ChildView::new(editor.clone())
.contained() .contained()
.with_margin_left(theme.entry.default.icon_spacing) .with_margin_left(theme.entry.default.icon_spacing)
@ -987,15 +995,28 @@ mod tests {
] ]
); );
panel let confirm = panel.update(cx, |panel, cx| {
.update(cx, |panel, cx| { panel
panel .filename_editor
.filename_editor .update(cx, |editor, cx| editor.set_text("the-new-filename", cx));
.update(cx, |editor, cx| editor.set_text("the-new-filename", cx)); panel.confirm(&Confirm, cx).unwrap()
panel.confirm(&Confirm, cx).unwrap() });
}) assert_eq!(
.await visible_entries_as_strings(&panel, 0..10, cx),
.unwrap(); &[
"v root1",
" > a",
" > b",
" > C",
" [PROCESSING: 'the-new-filename'] <== selected",
" .dockerignore",
"v root2",
" > d",
" > e",
]
);
confirm.await.unwrap();
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..10, cx), visible_entries_as_strings(&panel, 0..10, cx),
&[ &[
@ -1069,15 +1090,28 @@ mod tests {
] ]
); );
panel let confirm = panel.update(cx, |panel, cx| {
.update(cx, |panel, cx| { panel
panel .filename_editor
.filename_editor .update(cx, |editor, cx| editor.set_text("a-different-filename", cx));
.update(cx, |editor, cx| editor.set_text("a-different-filename", cx)); panel.confirm(&Confirm, cx).unwrap()
panel.confirm(&Confirm, cx).unwrap() });
}) assert_eq!(
.await visible_entries_as_strings(&panel, 0..9, cx),
.unwrap(); &[
"v root1",
" > a",
" v b",
" > 3",
" > 4",
" [PROCESSING: 'a-different-filename'] <== selected",
" > C",
" .dockerignore",
" the-new-filename",
]
);
confirm.await.unwrap();
assert_eq!( assert_eq!(
visible_entries_as_strings(&panel, 0..9, cx), visible_entries_as_strings(&panel, 0..9, cx),
&[ &[
@ -1167,11 +1201,12 @@ mod tests {
} else { } else {
" " " "
}; };
let editor_text = format!("[EDITOR: '{}']", details.filename);
let name = if details.is_editing { let name = if details.is_editing {
&editor_text format!("[EDITOR: '{}']", details.filename)
} else if details.is_processing {
format!("[PROCESSING: '{}']", details.filename)
} else { } else {
&details.filename details.filename.clone()
}; };
let selected = if details.is_selected { let selected = if details.is_selected {
" <== selected" " <== selected"