Skip to content

Fix #912 #917

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #912 #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions src/menu/columnar_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ impl Menu for ColumnarMenu {

/// Updates menu values
fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
if self.settings.only_buffer_difference && self.input.is_none() {
self.input = Some(editor.get_buffer().to_string());
}

let (input, pos) = completer_input(
editor.get_buffer(),
editor.insertion_point(),
Expand Down Expand Up @@ -551,20 +555,13 @@ impl Menu for ColumnarMenu {
if let Some(event) = self.event.take() {
match event {
MenuEvent::Activate(updated) => {
self.active = true;
self.reset_position();

self.input = if self.settings.only_buffer_difference {
Some(editor.get_buffer().to_string())
} else {
None
};

if !updated {
self.update_values(editor, completer);
}
}
MenuEvent::Deactivate => self.active = false,
MenuEvent::Deactivate => {}
MenuEvent::Edit(updated) => {
self.reset_position();

Expand Down
5 changes: 4 additions & 1 deletion src/menu/description_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,10 @@ impl Menu for DescriptionMenu {

/// Updates menu values
fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
if self.settings.only_buffer_difference && self.input.is_none() {
self.input = Some(editor.get_buffer().to_string());
}

let (input, pos) = completer_input(
editor.get_buffer(),
editor.insertion_point(),
Expand All @@ -465,7 +469,6 @@ impl Menu for DescriptionMenu {
match event {
MenuEvent::Activate(_) => {
self.reset_position();
self.input = Some(editor.get_buffer().to_string());
self.update_values(editor, completer);
}
MenuEvent::Deactivate => self.active = false,
Expand Down
13 changes: 5 additions & 8 deletions src/menu/ide_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,10 @@ impl Menu for IdeMenu {

/// Update menu values
fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
if self.settings.only_buffer_difference && self.input.is_none() {
self.input = Some(editor.get_buffer().to_string());
}

let (input, pos) = completer_input(
editor.get_buffer(),
editor.insertion_point(),
Expand Down Expand Up @@ -681,20 +685,13 @@ impl Menu for IdeMenu {
if let Some(event) = self.event.take() {
match event {
MenuEvent::Activate(updated) => {
self.active = true;
self.reset_position();

self.input = if self.settings.only_buffer_difference {
Some(editor.get_buffer().to_string())
} else {
None
};

if !updated {
self.update_values(editor, completer);
}
}
MenuEvent::Deactivate => self.active = false,
MenuEvent::Deactivate => {}
MenuEvent::Edit(updated) => {
self.reset_position();

Expand Down
15 changes: 5 additions & 10 deletions src/menu/list_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,10 @@ impl Menu for ListMenu {

/// Collecting the value from the completer to be shown in the menu
fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
if self.settings.only_buffer_difference && self.input.is_none() {
self.input = Some(editor.get_buffer().to_string());
}

let (input, pos) = completer_input(
editor.get_buffer(),
editor.insertion_point(),
Expand Down Expand Up @@ -422,23 +426,14 @@ impl Menu for ListMenu {
MenuEvent::Activate(_) => {
self.reset_position();

self.input = if self.settings.only_buffer_difference {
Some(editor.get_buffer().to_string())
} else {
None
};

self.update_values(editor, completer);

self.pages.push(Page {
size: self.printable_entries(painter),
full: false,
});
}
MenuEvent::Deactivate => {
self.active = false;
self.input = None;
}
MenuEvent::Deactivate => {}
MenuEvent::Edit(_) => {
self.update_values(editor, completer);
self.pages.push(Page {
Expand Down