git.iko.soy/helix
on master help sign in
Hold `Config` in `Application`, expect at least one editor view
aca9d73wojciechkepka
helix-term/src/application.rs+23−31
compare with master
unifiedsplit
@@ -44,12 +44,13 @@ pub struct Application {
44 compositor: Compositor,
44 compositor: Compositor,
45 editor: Editor,
45 editor: Editor,
46
46
47+ config: Config,
48+
47 theme_loader: Arc<theme::Loader>,
49 theme_loader: Arc<theme::Loader>,
48 syn_loader: Arc<syntax::Loader>,
50 syn_loader: Arc<syntax::Loader>,
49− callbacks: LspCallbacks,
50
51
52+ callbacks: LspCallbacks,
51 lsp_progress: LspProgressMap,
53 lsp_progress: LspProgressMap,
52− lsp_display_messages: bool,
53}
54}
54
55
55impl Application {
56impl Application {
@@ -86,7 +87,7 @@ impl Application {
86
87
87 let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone());
88 let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone());
88
89
89− let mut editor_view = Box::new(ui::EditorView::new(config.keymaps));
90+ let mut editor_view = Box::new(ui::EditorView::new(config.keymaps.clone()));
90 compositor.push(editor_view);
91 compositor.push(editor_view);
91
92
92 if !args.files.is_empty() {
93 if !args.files.is_empty() {
@@ -115,11 +116,13 @@ impl Application {
115 compositor,
116 compositor,
116 editor,
117 editor,
117
118
119+ config,
120+
118 theme_loader,
121 theme_loader,
119 syn_loader,
122 syn_loader,
123+
120 callbacks: FuturesUnordered::new(),
124 callbacks: FuturesUnordered::new(),
121 lsp_progress: LspProgressMap::new(),
125 lsp_progress: LspProgressMap::new(),
122− lsp_display_messages: config.lsp.display_messages,
123 };
126 };
124
127
125 Ok(app)
128 Ok(app)
@@ -205,6 +208,15 @@ impl Application {
205 server_id: usize,
208 server_id: usize,
206 ) {
209 ) {
207 use helix_lsp::{Call, MethodCall, Notification};
210 use helix_lsp::{Call, MethodCall, Notification};
211+ let editor_view = self
212+ .compositor
213+ .find(std::any::type_name::<ui::EditorView>())
214+ .expect("expected at least one EditorView");
215+ let editor_view = editor_view
216+ .as_any_mut()
217+ .downcast_mut::<ui::EditorView>()
218+ .unwrap();
219+
208 match call {
220 match call {
209 Call::Notification(helix_lsp::jsonrpc::Notification { method, params, .. }) => {
221 Call::Notification(helix_lsp::jsonrpc::Notification { method, params, .. }) => {
210 let notification = match Notification::parse(&method, params) {
222 let notification = match Notification::parse(&method, params) {
@@ -313,15 +325,7 @@ impl Application {
313 } else {
325 } else {
314 self.lsp_progress.end_progress(server_id, &token);
326 self.lsp_progress.end_progress(server_id, &token);
315 if !self.lsp_progress.is_progressing(server_id) {
327 if !self.lsp_progress.is_progressing(server_id) {
316− let ui = self
317− .compositor
318− .find(std::any::type_name::<ui::EditorView>())
319− .unwrap();
320− if let Some(ui) =
321− ui.as_any_mut().downcast_mut::<ui::EditorView>()
322− {
323− ui.spinners_mut().get_or_create(server_id).stop();
328+ editor_view.spinners_mut().get_or_create(server_id).stop();
324− };
325 }
329 }
326 self.editor.clear_status();
330 self.editor.clear_status();
327 return;
331 return;
@@ -362,19 +366,13 @@ impl Application {
362 if let lsp::WorkDoneProgress::End(_) = work {
366 if let lsp::WorkDoneProgress::End(_) = work {
363 self.lsp_progress.end_progress(server_id, &token);
367 self.lsp_progress.end_progress(server_id, &token);
364 if !self.lsp_progress.is_progressing(server_id) {
368 if !self.lsp_progress.is_progressing(server_id) {
365− let ui = self
366− .compositor
367− .find(std::any::type_name::<ui::EditorView>())
368− .unwrap();
369− if let Some(ui) = ui.as_any_mut().downcast_mut::<ui::EditorView>() {
370− ui.spinners_mut().get_or_create(server_id).stop();
369+ editor_view.spinners_mut().get_or_create(server_id).stop();
371− };
372 }
370 }
373 } else {
371 } else {
374 self.lsp_progress.update(server_id, token, work);
372 self.lsp_progress.update(server_id, token, work);
375 }
373 }
376
374
377− if self.lsp_display_messages {
375+ if self.config.lsp.display_messages {
378 self.editor.set_status(status);
376 self.editor.set_status(status);
379 }
377 }
380 self.render();
378 self.render();
@@ -400,16 +398,10 @@ impl Application {
400 MethodCall::WorkDoneProgressCreate(params) => {
398 MethodCall::WorkDoneProgressCreate(params) => {
401 self.lsp_progress.create(server_id, params.token);
399 self.lsp_progress.create(server_id, params.token);
402
400
403− let ui = self
404− .compositor
405− .find(std::any::type_name::<ui::EditorView>())
406− .unwrap();
407− if let Some(ui) = ui.as_any_mut().downcast_mut::<ui::EditorView>() {
408− let spinner = ui.spinners_mut().get_or_create(server_id);
401+ let spinner = editor_view.spinners_mut().get_or_create(server_id);
409− if spinner.is_stopped() {
402+ if spinner.is_stopped() {
410− spinner.start();
403+ spinner.start();
411− }
412− };
404+ }
413
405
414 let doc = self.editor.documents().find(|doc| {
406 let doc = self.editor.documents().find(|doc| {
415 doc.language_server()
407 doc.language_server()