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

Actually split mi and ma into several subcommands #1723

Closed
wants to merge 10 commits into from
Closed

Actually split mi and ma into several subcommands #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93f2d18
Improve Compositor::find API and impl
The0x539 Mar 20, 2022
23f9189
Implement fallback commands
The0x539 Mar 20, 2022
5563b3f
Add compositor callbacks for pickers
The0x539 Mar 20, 2022
cb0266c
Split select_textobject into actual separate commands
The0x539 Mar 20, 2022
fb89e95
Fix keymap unit tests
The0x539 Mar 20, 2022
e7b9001
Address clippy lints
The0x539 Mar 20, 2022
c81315b
Actually include fallback commands in infobox
The0x539 Mar 20, 2022
2cc001e
Account for fallback bindings when merging keymaps
The0x539 Mar 20, 2022
992e5b9
Remove pseudo_pending hack
The0x539 Mar 20, 2022
b33c4da
Fix static_commands formatting
The0x539 Mar 22, 2022
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
19 changes: 4 additions & 15 deletions helix-term/src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,7 @@ impl Application {

pub fn handle_idle_timeout(&mut self) {
use crate::compositor::EventResult;
let editor_view = self
.compositor
.find::<ui::EditorView>()
.expect("expected at least one EditorView");
let editor_view = self.compositor.editor_view();

let mut cx = crate::compositor::Context {
editor: &mut self.editor,
Expand Down Expand Up @@ -622,14 +619,9 @@ impl Application {
log::info!("window/logMessage: {:?}", params);
}
Notification::ProgressMessage(params)
if !self
.compositor
.has_component(std::any::type_name::<ui::Prompt>()) =>
if !self.compositor.has_component::<ui::Prompt>() =>
{
let editor_view = self
.compositor
.find::<ui::EditorView>()
.expect("expected at least one EditorView");
let editor_view = self.compositor.editor_view();
let lsp::ProgressParams { token, value } = params;

let lsp::ProgressParamsValue::WorkDone(work) = value;
Expand Down Expand Up @@ -724,10 +716,7 @@ impl Application {
MethodCall::WorkDoneProgressCreate(params) => {
self.lsp_progress.create(server_id, params.token);

let editor_view = self
.compositor
.find::<ui::EditorView>()
.expect("expected at least one EditorView");
let editor_view = self.compositor.editor_view();
let spinner = editor_view.spinners_mut().get_or_create(server_id);
if spinner.is_stopped() {
spinner.start();
Expand Down
Loading