Update codeit-autocomplete.js

Author: benhatsor

lib/plugins/codeit-autocomplete.js

@@ -16,7 +16,6 @@ let acp = {
 
   curr: {
     query: '',
-    rawQuery: '',
     topHit: '',
     results: []
   },
@@ -63,7 +62,7 @@ acp.autocomplete = async (lang) => {
   }
 
   // if shouldn't autocomplete, return
-  const shouldAutocomplete = acp.utils.shouldAutocomplete();
+  let shouldAutocomplete = acp.utils.shouldAutocomplete();
   if (!shouldAutocomplete) return;
 
 
@@ -78,24 +77,29 @@ acp.autocomplete = async (lang) => {
 
   if (langAcp.processQuery) {
 
-    query = langAcp.processQuery(query);
+    [query, shouldAutocomplete] = langAcp.processQuery(query);
+    
+    if (!shouldAutocomplete) return;
 
   }
 
 
-  // if query didn't change, return
-  if (query === acp.curr.query &&
-      rawQuery === acp.curr.rawQuery) return;
+  if (!langAcp.processQuery) {
+      
+    // if query didn't change, return
+    if (query === acp.curr.query) return;
+  
+  } 
+  
 
   // update query
   acp.curr.query = query;
-  acp.curr.rawQuery = rawQuery;
 
 
   let results = [];
 
   // if query exists
-  if (query !== '' || rawQuery !== '') {
+  if (query !== '' && !langAcp.processQuery) {
 
     // autocomplete query
     results = acp.lang[lang].autocomplete(query, rawQuery);
@@ -298,15 +302,18 @@ acp.lang.javascript = acp.lang.js;
 acp.lang.js.processQuery = (query) => {
 
   // if query dosen't include a '.', return
-  if (!query.includes('.')) return '';
+  if (!query.includes('.')) return ['', false];
 
   // split query to get hierarchy
   let hierarchy = query.split('.');
 
   // update query to last item in hierarchy
   const pQuery = hierarchy[hierarchy.length - 1];
 
-  return pQuery;
+  // if query didn't change, return
+  if (pQuery !== '' && pQuery === acp.curr.query) return ['', false];
+  
+  return [pQuery, true];
 
 }