suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Satisfy clippy.

pull/398/head
Joe Neeman 2021-06-28 08:00:44 -05:00 committed by Blaž Hrastnik
parent d64d75e724
commit ffa2f2590b
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-term/src/application.rs
View File

@ -167,7 +167,7 @@ impl Application {
} }
self.render(); self.render();
} }
Some(callback) = self.jobs.next() => { Some(callback) = self.jobs.next_job() => {
self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback); self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
self.render(); self.render();
} }

37
helix-term/src/commands.rs
View File

@ -1917,31 +1917,28 @@ fn append_to_line(cx: &mut Context) {
// Creates an LspCallback that waits for formatting changes to be computed. When they're done, // Creates an LspCallback that waits for formatting changes to be computed. When they're done,
// it applies them, but only if the doc hasn't changed. // it applies them, but only if the doc hasn't changed.
fn make_format_callback( async fn make_format_callback(
doc_id: DocumentId, doc_id: DocumentId,
doc_version: i32, doc_version: i32,
set_unmodified: bool, set_unmodified: bool,
format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static, format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static,
) -> impl Future<Output = anyhow::Result<job::Callback>> { ) -> anyhow::Result<job::Callback> {
async move { let format = format.await;
let format = format.await; let call: job::Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
let call: job::Callback = let view_id = view!(editor).id;
Box::new(move |editor: &mut Editor, compositor: &mut Compositor| { if let Some(doc) = editor.document_mut(doc_id) {
let view_id = view!(editor).id; if doc.version() == doc_version {
if let Some(doc) = editor.document_mut(doc_id) { doc.apply(&Transaction::from(format), view_id);
if doc.version() == doc_version { doc.append_changes_to_history(view_id);
doc.apply(&Transaction::from(format), view_id); if set_unmodified {
doc.append_changes_to_history(view_id); doc.reset_modified();
if set_unmodified {
doc.reset_modified();
}
} else {
log::info!("discarded formatting changes because the document changed");
}
} }
}); } else {
Ok(call) log::info!("discarded formatting changes because the document changed");
} }
}
});
Ok(call)
} }
enum Open { enum Open {

8
helix-term/src/job.rs
View File

@ -33,7 +33,7 @@ impl Job {
f: F, f: F,
) -> Job { ) -> Job {
Job { Job {
future: f.map(|r| r.map(|x| Some(x))).boxed(), future: f.map(|r| r.map(Some)).boxed(),
wait: false, wait: false,
} }
} }
@ -77,9 +77,9 @@ impl Jobs {
} }
} }
pub fn next<'a>( pub fn next_job(
&'a mut self, &mut self,
) -> impl Future<Output = Option<anyhow::Result<Option<Callback>>>> + 'a { ) -> impl Future<Output = Option<anyhow::Result<Option<Callback>>>> + '_ {
future::select(self.futures.next(), self.wait_futures.next()) future::select(self.futures.next(), self.wait_futures.next())
.map(|either| either.factor_first().0) .map(|either| either.factor_first().0)
} }