cargo fmt

pull/1803/head
Joseph Harrison-Lim 3 years ago
parent 124ea239b4
commit 3676e2e5d9
No known key found for this signature in database
GPG Key ID: 5DAB214D5E62987D

@ -259,7 +259,7 @@ impl Application {
pub fn handle_config_events(&mut self, config_event: ConfigEvent) { pub fn handle_config_events(&mut self, config_event: ConfigEvent) {
match config_event { match config_event {
ConfigEvent::Refresh => { self.refresh_config() } ConfigEvent::Refresh => self.refresh_config(),
ConfigEvent::Update(editor_config) => { ConfigEvent::Update(editor_config) => {
let mut app_config = (*self.config.load().clone()).clone(); let mut app_config = (*self.config.load().clone()).clone();
app_config.editor = editor_config; app_config.editor = editor_config;

@ -848,7 +848,12 @@ fn goto_window(cx: &mut Context, align: Align) {
// - 1 so we have at least one gap in the middle. // - 1 so we have at least one gap in the middle.
// a height of 6 with padding of 3 on each side will keep shifting the view back and forth // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
// as we type // as we type
let scrolloff = cx.editor.config.load().scrolloff.min(height.saturating_sub(1) / 2); let scrolloff = cx
.editor
.config
.load()
.scrolloff
.min(height.saturating_sub(1) / 2);
let last_line = view.last_line(doc); let last_line = view.last_line(doc);

@ -118,7 +118,12 @@ impl EditorView {
let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused { let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
Box::new(syntax::merge( Box::new(syntax::merge(
highlights, highlights,
Self::doc_selection_highlights(doc, view, theme, &editor.config.load().cursor_shape), Self::doc_selection_highlights(
doc,
view,
theme,
&editor.config.load().cursor_shape,
),
)) ))
} else { } else {
Box::new(highlights) Box::new(highlights)

@ -39,7 +39,7 @@ use helix_dap as dap;
use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize}; use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize};
use arc_swap::{access::DynAccess}; use arc_swap::access::DynAccess;
fn deserialize_duration_millis<'de, D>(deserializer: D) -> Result<Duration, D::Error> fn deserialize_duration_millis<'de, D>(deserializer: D) -> Result<Duration, D::Error>
where where

Loading…
Cancel
Save