54a7e89 · helix · git.iko.soy

on master help sign in

lsp: Wire up didClose notification on editor.close.

54a7e89Blaž Hrastnik6 years ago

helix-term/src/commands.rs+1−1

@@ -691,7 +691,7 @@ pub fn command_mode(cx: &mut Context) {

691

692 match *parts.as_slice() {

693 ["q"] | ["quit"] => {

694− editor.tree.remove(editor.view().id);

694+ editor.close(editor.view().id, executor);

695 // editor.should_close = true,

696 }

697 ["o", path] | ["open", path] => {

helix-view/src/editor.rs+16−2

@@ -48,7 +48,7 @@ impl Editor {

49 let language_id = doc

50 .language()

51− .and_then(|s| s.split(".").last()) // source.rust

51+ .and_then(|s| s.split('.').last()) // source.rust

52 .map(ToOwned::to_owned)

53 .unwrap_or_default();

@@ -66,7 +66,21 @@ impl Editor {

66 Ok(())

67 }

69− pub fn close(&mut self, id: Key) {

69+ pub fn close(&mut self, id: Key, executor: &smol::Executor) {

70+ let view = self.tree.get(self.tree.focus);

71+ // get around borrowck issues

72+ let language_servers = &mut self.language_servers;

73+

74+ let doc = &view.doc;

75+

76+ let language_server = doc

77+ .language

78+ .as_ref()

79+ .and_then(|language| language_servers.get(language, &executor));

80+

81+ if let Some(language_server) = language_server {

82+ smol::block_on(language_server.text_document_did_close(doc.identifier())).unwrap();

83+ }

70 self.tree.remove(id)

84 self.tree.remove(id)

71 }

85 }