fix

Author: linzhijun

HtmlEditor/ace/ext-language_tools.js

@@ -1761,7 +1761,7 @@ define("ace/autocomplete", ["require", "exports", "module", "ace/keyboard/hash_h
                 results.push(item);
             }
             loop2: for (var i = 0, item; item = items[i]; i++) {
-                var caption = item.pinyin;
+                var caption = item.meta;
                 if (!caption)
                     continue;
                 var lastIndex = -1;
@@ -1800,6 +1800,46 @@ define("ace/autocomplete", ["require", "exports", "module", "ace/keyboard/hash_h
                 item.$score = (item.score || 0) - penalty;
                 results.push(item);
             }
+            loop3: for (var i = 0, item; item = items[i]; i++) {
+                var caption = item.pinyin;
+                if (!caption)
+                    continue;
+                var lastIndex = -1;
+                var matchMask = 0;
+                var penalty = 0;
+                var index, distance;
+                if (this.exactMatch) {
+                    if (needle !== caption.substr(0, needle.length))
+                        continue loop3;
+                }
+                else {
+                    var fullMatchIndex = caption.toLowerCase().indexOf(lower);
+                    if (fullMatchIndex > -1) {
+                        penalty = fullMatchIndex;
+                    }
+                    else {
+                        for (var j = 0; j < needle.length; j++) {
+                            var i1 = caption.indexOf(lower[j], lastIndex + 1);
+                            var i2 = caption.indexOf(upper[j], lastIndex + 1);
+                            index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
+                            if (index < 0)
+                                continue loop3;
+                            distance = index - lastIndex - 1;
+                            if (distance > 0) {
+                                if (lastIndex === -1)
+                                    penalty += 10;
+                                penalty += distance;
+                                matchMask = matchMask | (1 << j);
+                            }
+                            lastIndex = index;
+                        }
+                    }
+                }
+                item.matchMask = matchMask;
+                item.exactMatch = penalty ? 0 : 1;
+                item.$score = (item.score || 0) - penalty;
+                results.push(item);
+            }
             return results;
         };
     }).call(FilteredList.prototype);

HtmlEditor/ace/ext-language_tools.src.js

@@ -3,7 +3,7 @@ ace.config.setModuleUrl('ace/mode/my-mode', 'my-mode.js');
 ace.config.setModuleUrl('ace/worker/my-worker', 'my-worker.js');
 ace.mymodeFirstCreate = true;
 ace.jsmodeFirstCreate = true;
-window.createEditor=function(id, outId) {
+window.createEditor = function (id, outId) {
     var editor = ace.edit(id);
     editor.getSession().setMode('ace/mode/my-mode');
     editor.setTheme("ace/theme/crimson_editor");
@@ -35,7 +35,7 @@ window.createEditor=function(id, outId) {
             getCompletions: function (editor, session, pos, prefix, callback) {
                 if (editor.getSession().getMode().$id != 'ace/mode/my-mode') { callback(null, []); return }
                 if (prefix.length === 0) { callback(null, []); return }
-                callback(null, ace_keywords.map(function (ea) { return { pinyin: ea.pinyin, caption: ea.caption, name: ea.text, value: ea.text, meta: ea.meta } }));
+                callback(null, ace_keywords.map(function (ea) { return { caption: ea.caption, pinyin: ea.pinyin, name: ea.text, value: ea.text, meta: ea.meta } }));
             }
         }
         langTools.addCompleter(rhymeCompleter);

HtmlEditor/createEditor.js

@@ -256,8 +256,8 @@ ace_keywords = [{
     "meta": "调和平均值"
 }, {
     "caption": "has",
-    "text": "has(文本)",
-    "meta": "...包含"
+    "text": "has(json/数组,文本)",
+    "meta": "包含"
 }, {
     "caption": "hour",
     "text": "hour(日期)",