diff options
| -rw-r--r-- | helix-term/src/commands.rs | 2 | ||||
| -rw-r--r-- | helix-view/src/editor.rs | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index d80662d7..353d79cc 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -691,7 +691,7 @@ pub fn command_mode(cx: &mut Context) { match *parts.as_slice() { ["q"] | ["quit"] => { - editor.tree.remove(editor.view().id); + editor.close(editor.view().id, executor); // editor.should_close = true, } ["o", path] | ["open", path] => { diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 0dd0592c..b04a07dd 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -48,7 +48,7 @@ impl Editor { let language_id = doc .language() - .and_then(|s| s.split(".").last()) // source.rust + .and_then(|s| s.split('.').last()) // source.rust .map(ToOwned::to_owned) .unwrap_or_default(); @@ -66,7 +66,21 @@ impl Editor { Ok(()) } - pub fn close(&mut self, id: Key) { + pub fn close(&mut self, id: Key, executor: &smol::Executor) { + let view = self.tree.get(self.tree.focus); + // get around borrowck issues + let language_servers = &mut self.language_servers; + + let doc = &view.doc; + + let language_server = doc + .language + .as_ref() + .and_then(|language| language_servers.get(language, &executor)); + + if let Some(language_server) = language_server { + smol::block_on(language_server.text_document_did_close(doc.identifier())).unwrap(); + } self.tree.remove(id) } |