Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIXED TODO: Avoided take() function on the run editor method #11

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FIXED TODO: Avoided take() function on the run editor method #11

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9422a47
FIXED TODO: Avoided take() function on the run editor method
rrsmart8 Jan 5, 2024
6f287ed
FIXED TODO: Removed the take() usage for the key match inside the pro…
rrsmart8 Jan 5, 2024
c8fdc6d
Modified the save_as function to handle the case when the file alread…
rrsmart8 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions src/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,13 @@ impl Editor {
/// attribute of the editor will be set and syntax highlighting will be updated.
fn save_as(&mut self, file_name: String) -> Result<(), Error> {
// TODO: What if file_name already exists?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the TODO comment.

if std::fs::metadata(&file_name).is_ok() {
// File already exists, handle accordingly (e.g., show a warning or prompt for overwrite)
// For simplicity, we'll return an error here.
return Err(Error::FileAlreadyExists);
}

if self.save_and_handle_io_errors(&file_name) {
// If save was successful
self.select_syntax_highlight(Path::new(&file_name))?;
Expand Down Expand Up @@ -637,13 +644,14 @@ impl Editor {
let times = if quit_times > 1 { "times" } else { "time" };
set_status!(self, "Press Ctrl+Q {} more {} to quit.", quit_times, times);
}
Key::Char(SAVE) => match self.file_name.take() {
// TODO: Can we avoid using take() then reassigning the value to file_name?
Some(file_name) => {
self.save_and_handle_io_errors(&file_name);
self.file_name = Some(file_name);
Key::Char(SAVE) => {
match mem::replace(&mut self.file_name, None) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has the same effect as take, I would leave the take function in place has it adds more meaning. Your solution also adds an extra line of code.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you could avoid using take by borrowing the value in the match arm:

Key::Char(SAVE) => match self.file_name {
                // TODO: Can we avoid using take() then reassigning the value to file_name?
                Some(ref file_name) => {
                    self.save_and_handle_io_errors(file_name);
                    self.file_name = Some(file_name);
                // ...

Some(file_name) => {
self.save_and_handle_io_errors(&file_name);
self.file_name = Some(file_name);
}
None => prompt_mode = Some(PromptMode::Save(String::new())),
}
None => prompt_mode = Some(PromptMode::Save(String::new())),
},
Key::Char(FIND) =>
prompt_mode = Some(PromptMode::Find(String::new(), self.cursor.clone(), None)),
Expand Down Expand Up @@ -691,31 +699,33 @@ impl Editor {
///
/// Will Return `Err` if any error occur.
pub fn run(&mut self, file_name: &Option<String>) -> Result<(), Error> {
if let Some(path) = file_name.as_ref().map(|p| sys::path(p.as_str())) {
if let Some(path) = file_name.as_ref().and_then(|p| Some(sys::path(p.as_str()))) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use map_or_else?

self.select_syntax_highlight(path.as_path())?;
self.load(path.as_path())?;
self.file_name = Some(path.to_string_lossy().to_string());
} else {
self.rows.push(Row::new(Vec::new()));
self.file_name = None;
}

loop {
if let Some(mode) = self.prompt_mode.as_ref() {
set_status!(self, "{}", mode.status_msg());
}

self.refresh_screen()?;
let key = self.loop_until_keypress()?;
// TODO: Can we avoid using take()?
self.prompt_mode = match self.prompt_mode.take() {
// process_keypress returns (should_quit, prompt_mode)

self.prompt_mode = match self.prompt_mode.map_or_else(|| None, |pm| Some(pm.process_keypress(self, &key)?)) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use map_or_else?

None => match self.process_keypress(&key) {
(true, _) => return Ok(()),
(false, prompt_mode) => prompt_mode,
(false, new_mode) => Some(new_mode),
},
Some(prompt_mode) => prompt_mode.process_keypress(self, &key)?,
}
pm => pm,
};
}
}

}

impl Drop for Editor {
Expand Down
Loading