From a024fd89919efb6648738ea18fbadbd24982a732 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 May 2019 12:38:01 +0200
Subject: [PATCH 1/2] port tab completion from MessageComposerInput

---
 src/editor/autocomplete.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/editor/autocomplete.js b/src/editor/autocomplete.js
index fa07ec56ff..ceaf18c444 100644
--- a/src/editor/autocomplete.js
+++ b/src/editor/autocomplete.js
@@ -39,8 +39,24 @@ export default class AutocompleteWrapperModel {
         this._updateCallback({close: true});
     }
 
-    onTab() {
-        //forceCompletion here?
+    async onTab(e) {
+        const acComponent = this._getAutocompleterComponent();
+
+        if (acComponent.state.completionList.length === 0) {
+            // Force completions to show for the text currently entered
+            await acComponent.forceComplete();
+            // Select the first item by moving "down"
+            await acComponent.onDownArrow();
+        } else {
+            if (e.shiftKey) {
+                await acComponent.onUpArrow();
+            } else {
+                await acComponent.onDownArrow();
+            }
+        }
+        this._updateCallback({
+            close: true,
+        });
     }
 
     onUpArrow() {

From cf5e4d3d94fff9f0446951d0d71f045fc0d8c89f Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 24 May 2019 12:38:19 +0200
Subject: [PATCH 2/2] make consecutive :/@/# separate pill candidates

e.g. accept the first character always to start the autocompletion
but after that refer to the plainpart logic to split up in
new pill candidates. Also, don't allow merging adjacent parts.

This makes sure that "@nonmatchingfoo @someuser"
only matches "someuser" in the autocomplete.
---
 src/editor/parts.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/editor/parts.js b/src/editor/parts.js
index ad50009d49..fbdd22d8bb 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -313,8 +313,16 @@ export class PillCandidatePart extends PlainPart {
         return this._autoCompleteCreator(updateCallback);
     }
 
-    acceptsInsertion(chr) {
-        return true;
+    acceptsInsertion(chr, i) {
+        if (i === 0) {
+            return true;
+        } else {
+            return super.acceptsInsertion(chr, i);
+        }
+    }
+
+    merge() {
+        return false;
     }
 
     acceptsRemoval(position, chr) {