From b4cf010eeed1aeeb3cf13526fbdfb9fe3156be39 Mon Sep 17 00:00:00 2001 From: tophf Date: Sat, 13 Mar 2021 08:53:43 +0300 Subject: [PATCH] fix: restore proper toggling of autocompleteOnTyping --- edit/autocomplete.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/edit/autocomplete.js b/edit/autocomplete.js index b52bf7c9..449b34e1 100644 --- a/edit/autocomplete.js +++ b/edit/autocomplete.js @@ -27,20 +27,20 @@ const originalHelper = CodeMirror.hint.css || (() => {}); let cssMedia, cssProps, cssPropsValues; - const aot = prefs.get('editor.autocompleteOnTyping'); - CodeMirror.defineOption('autocompleteOnTyping', aot, aotToggled); - if (aot) cmFactory.globalSetOption('autocompleteOnTyping', true); + const AOT_ID = 'autocompleteOnTyping'; + const AOT_PREF_ID = 'editor.' + AOT_ID; + const aot = prefs.get(AOT_PREF_ID); + CodeMirror.defineOption(AOT_ID, aot, (cm, value) => { + cm[value ? 'on' : 'off']('changes', autocompleteOnTyping); + cm[value ? 'on' : 'off']('pick', autocompletePicked); + }); + prefs.subscribe(AOT_PREF_ID, (key, val) => cmFactory.globalSetOption(AOT_ID, val), {runNow: aot}); CodeMirror.registerHelper('hint', 'css', helper); CodeMirror.registerHelper('hint', 'stylus', helper); tokenHooks['/'] = tokenizeUsoVariables; - function aotToggled(cm, value) { - cm[value ? 'on' : 'off']('changes', autocompleteOnTyping); - cm[value ? 'on' : 'off']('pick', autocompletePicked); - } - async function helper(cm) { const pos = cm.getCursor(); const {line, ch} = pos;