c0a8b81 · helix · git.iko.soy

git.iko.soy/helix

Only send the document close event if we're closing the underlying buffer

commitc0a8b814870335986b595af25a10330bfe077793 authorBlaž Hrastnik <blaz@mxxn.io> dateFri 7 May 2021, 14:52 (5 years ago) parentc208136

2 files changed+17−17

compare with master

unifiedsplit

helix-term/src/commands.rs+2−2 helix-view/src/editor.rs+15−15

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

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

856856

857857 match *parts.as_slice() {

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

859− editor.close(editor.view().id);

859+ editor.close(editor.view().id, /* close_buffer */ false);

860860 }

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

862862 editor.open(path.into(), Action::Replace);

@@ -2085,7 +2085,7 @@ pub fn space_mode(cx: &mut Context) {

20852085 }

20862086 'c' => {

20872087 // close current split

2088− cx.editor.close(cx.view_id);

2088+ cx.editor.close(cx.view_id, /* close_buffer */ false);

20892089 }

20902090 // ' ' => toggle_alternate_buffer(cx),

20912091 // TODO: temporary since space mode took it's old key

helix-view/src/editor.rs+15−15

@@ -162,26 +162,26 @@ impl Editor {

162162 Ok(id)

163163 }

164164

165− pub fn close(&mut self, id: ViewId) {

165+ pub fn close(&mut self, id: ViewId, close_buffer: bool) {

166166 let view = self.tree.get(self.tree.focus);

167− // get around borrowck issues

168− let language_servers = &mut self.language_servers;

169−

170− let doc = &self.documents[view.doc];

167+ // remove selection

168+ self.documents[view.doc].selections.remove(&id);

171169

172− let language_server = doc

173− .language

174− .as_ref()

175− .and_then(|language| language_servers.get(language));

170+ if close_buffer {

171+ // get around borrowck issues

172+ let language_servers = &mut self.language_servers;

173+ let doc = &self.documents[view.doc];

176174

177− if let Some(language_server) = language_server {

178− tokio::spawn(language_server.text_document_did_close(doc.identifier()));

175+ let language_server = doc

176+ .language

177+ .as_ref()

178+ .and_then(|language| language_servers.get(language));

179+ if let Some(language_server) = language_server {

180+ tokio::spawn(language_server.text_document_did_close(doc.identifier()));

181+ }

182+ self.documents.remove(view.doc);

179183 }

180184

181− // remove selection

182− self.documents[view.doc].selections.remove(&id);

183−

184− // self.documents.remove(view.doc);

185185 self.tree.remove(id);

186186 self._refresh();

187187 }