From 22587da5ff12e71ca55696f200c4ca581323deb4 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 9 May 2019 16:07:00 +0200
Subject: [PATCH] close autocomplete on enter

---
 src/editor/autocomplete.js | 2 +-
 src/editor/model.js        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index 0512a4ac49..d7ad211de2 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -34,7 +34,7 @@ export default class AutocompleteWrapperModel {
     }
 
     onEnter() {
-
+        this._updateCallback({close: true});
     }
 
     onTab() {
diff --git a/src/editor/model.js b/src/editor/model.js
index 999d37efca..2fa1541b99 100644
--- a/src/editor/model.js
+++ b/src/editor/model.js
@@ -116,7 +116,9 @@ export default class EditorModel {
     }
 
     _onAutoComplete = ({replacePart, replaceCaret, close}) => {
-        this._replacePart(this._autoCompletePartIdx, replacePart);
+        if (replacePart) {
+            this._replacePart(this._autoCompletePartIdx, replacePart);
+        }
         const index = this._autoCompletePartIdx;
         if (close) {
             this._autoComplete = null;