From ece11167f3d16ab58dd8046b4dcf2162111189d1 Mon Sep 17 00:00:00 2001
From: David Evans <davidje13@users.noreply.github.com>
Date: Wed, 22 Nov 2017 18:52:35 +0000
Subject: [PATCH] Improve autocomplete triggers to make editing more intuitive

---
 scripts/interface/Interface.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/interface/Interface.js b/scripts/interface/Interface.js
index 20480c5..7916d84 100644
--- a/scripts/interface/Interface.js
+++ b/scripts/interface/Interface.js
@@ -145,17 +145,15 @@ define([
 			code.on('keydown', (cm, event) => {
 				lastKey = event.keyCode;
 			});
-			code.on('endCompletion', () => {
-				lastKey = 0;
-			});
 			code.on('change', (cm, change) => {
-				if(cm.state.completionActive || change.origin === 'library') {
+				if(change.origin === '+input') {
+					if(lastKey === 13) {
+						lastKey = 0;
+						return;
+					}
+				} else if(change.origin !== 'complete') {
 					return;
 				}
-				if(lastKey === 13 || lastKey === 8) {
-					return;
-				}
-				lastKey = 0;
 				CodeMirror.commands.autocomplete(cm, null, {
 					completeSingle: false,
 				});