Remove remnants from conflict resolution (#3528)

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
This commit is contained in:
Joseph T. Lyons 2023-12-06 23:44:49 -05:00 committed by GitHub
parent 27e1787ce3
commit 2a68a6171a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 40 deletions

View file

@ -1717,11 +1717,6 @@ impl Editor {
let focus_handle = cx.focus_handle();
cx.on_focus(&focus_handle, Self::handle_focus).detach();
cx.on_blur(&focus_handle, Self::handle_blur).detach();
cx.on_release(|this, cx| {
//todo!()
//cx.emit_global(EditorReleased(self.handle.clone()));
})
.detach();
let mut this = Self {
handle: cx.view().downgrade(),
@ -8197,7 +8192,7 @@ impl Editor {
}
pub fn text_option(&self, cx: &AppContext) -> Option<String> {
let text = self.buffer.read(cx).read(cx).text();
let text = self.text(cx);
let text = text.trim();
if text.is_empty() {