v.3.0.0 (typo change)

foo123 · Mar 24, 2016 · 904918a · 904918a
1 parent a1e1650
commit 904918a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/build/codemirror_grammar.js b/build/codemirror_grammar.js
@@ -1245,7 +1245,7 @@ function generate_autocompletion( token, follows )
             {
                 follows.push.apply( follows, tok.autocompletions );
             }
-            else if ( (T_STR === tok.token.ptype) && (tok.token.pattern.length > 1) )
+            else if ( (T_STR === tok.token.ptype) && (T_STR&get_type(tok.token.pattern)) && (tok.token.pattern.length > 1) )
             {
                 follows.push( {word:''+tok.token.pattern, meta:tok.name, ci:!!tok.ci} );
             }
@@ -3787,6 +3787,7 @@ var CodeMirrorParser = Class(Parser, {
                 else
                 {
                     wm = word.meta;
+                    if ( wl+wm.length > maxlen ) maxlen = wl+wm.length;
                     list.push({
                         text: w, name: w, meta: wm,
                         start: 0, end: 0, match: '',

diff --git a/build/codemirror_grammar.min.js b/build/codemirror_grammar.min.js
diff --git a/editor-grammar b/editor-grammar
diff --git a/src/main.js b/src/main.js
@@ -168,6 +168,7 @@ var CodeMirrorParser = Class(Parser, {
                 else
                 {
                     wm = word.meta;
+                    if ( wl+wm.length > maxlen ) maxlen = wl+wm.length;
                     list.push({
                         text: w, name: w, meta: wm,
                         start: 0, end: 0, match: '',