git.iko.soy/helix
on master help sign in
move language server refresh to document saved event handler
commitb3fc31a211293f48696d26855781577d1859c2c6 authorSkyler Hawthorne <skyler@dead10ck.com> dateFri 2 Sep 2022, 09:20 (4 years ago) parentaf03df3
2 files changed+28−23
compare with master
unifiedsplit
helix-term/src/application.rs+27−15 helix-term/src/commands.rs+1−8
helix-term/src/application.rs+27−15
@@ -462,22 +462,34 @@ impl Application {
462462 let lines = doc_save_event.text.len_lines();
463463 let bytes = doc_save_event.text.len_bytes();
464464
465− if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
466− log::error!(
467− "error setting path for doc '{:?}': {}",
468− doc.path(),
469− err.to_string(),
470− );
471− self.editor.set_error(err.to_string());
472− } else {
473− // TODO: fix being overwritten by lsp
474− self.editor.set_status(format!(
475− "'{}' written, {}L {}B",
476− get_relative_path(&doc_save_event.path).to_string_lossy(),
477− lines,
478− bytes
479− ));
465+ if doc.path() != Some(&doc_save_event.path) {
466+ if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
467+ log::error!(
468+ "error setting path for doc '{:?}': {}",
469+ doc.path(),
470+ err.to_string(),
471+ );
472+
473+ self.editor.set_error(err.to_string());
474+ return;
475+ }
476+
477+ let loader = self.editor.syn_loader.clone();
478+
479+ // borrowing the same doc again to get around the borrow checker
480+ let doc = self.editor.document_mut(doc_save_event.doc_id).unwrap();
481+ let id = doc.id();
482+ doc.detect_language(loader);
483+ let _ = self.editor.refresh_language_server(id);
480484 }
485+
486+ // TODO: fix being overwritten by lsp
487+ self.editor.set_status(format!(
488+ "'{}' written, {}L {}B",
489+ get_relative_path(&doc_save_event.path).to_string_lossy(),
490+ lines,
491+ bytes
492+ ));
481493 }
482494
483495 #[inline(always)]
helix-term/src/commands.rs+1−8
@@ -2519,7 +2519,7 @@ async fn make_format_callback(
25192519 write: Option<(Option<PathBuf>, bool)>,
25202520) -> anyhow::Result<job::Callback> {
25212521 let format = format.await?;
2522− let call: job::Callback = Callback::EditorCompositor(Box::new(move |editor, _compositor| {
2522+ let call: job::Callback = Callback::Editor(Box::new(move |editor| {
25232523 if !editor.documents.contains_key(&doc_id) {
25242524 return;
25252525 }
@@ -2527,7 +2527,6 @@ async fn make_format_callback(
25272527 let scrolloff = editor.config().scrolloff;
25282528 let doc = doc_mut!(editor, &doc_id);
25292529 let view = view_mut!(editor);
2530− let loader = editor.syn_loader.clone();
25312530
25322531 if doc.version() == doc_version {
25332532 apply_transaction(&format, doc, view);
@@ -2536,14 +2535,8 @@ async fn make_format_callback(
25362535 view.ensure_cursor_in_view(doc, scrolloff);
25372536
25382537 if let Some((path, force)) = write {
2539− let refresh_lang = path.is_some();
2540−
25412538 if let Err(err) = doc.save(path, force) {
25422539 editor.set_error(format!("Error saving: {}", err));
2543− } else if refresh_lang {
2544− let id = doc.id();
2545− doc.detect_language(loader);
2546− let _ = editor.refresh_language_server(id);
25472540 }
25482541 }
25492542 } else {