Merge pull request #5395 from adobe/randy/issue-5003

RaymondLim · RaymondLim · commit b577c416b347 · 2013-10-03T15:09:34.000-07:00
Use precise=false for performance when parsing unchanging code
diff --git a/src/extensions/default/JavaScriptCodeHints/Session.js b/src/extensions/default/JavaScriptCodeHints/Session.js
@@ -131,9 +131,9 @@ define(function (require, exports, module) {
         var cm = this.editor._codeMirror;
 
         if (cursor) {
-            return cm.getTokenAt(cursor, true);
+            return cm.getTokenAt(cursor);
         } else {
-            return cm.getTokenAt(this.getCursor(), true);
+            return cm.getTokenAt(this.getCursor());
         }
     };
 
diff --git a/src/language/HTMLUtils.js b/src/language/HTMLUtils.js
@@ -482,7 +482,7 @@ define(function (require, exports, module) {
             outerMode = editor._codeMirror.getMode(),
             tokenModeName;
         
-        while (TokenUtils.moveNextToken(ctx)) {
+        while (TokenUtils.moveNextToken(ctx, false)) {
             tokenModeName = CodeMirror.innerMode(outerMode, ctx.token.state).mode.name;
             if (inBlock) {
                 if (!currentBlock.end) {
diff --git a/src/utils/TokenUtils.js b/src/utils/TokenUtils.js
@@ -51,9 +51,15 @@ define(function (require, exports, module) {
     /**
      * Moves the given context backwards by one token.
      * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx
+     * @param {boolean=} precise If code is being edited, use true (default) for accuracy.
+     *      If parsing unchanging code, use false to use cache for performance.
      * @return {boolean} whether the context changed
      */
-    function movePrevToken(ctx) {
+    function movePrevToken(ctx, precise) {
+        if (precise === undefined) {
+            precise = true;
+        }
+        
         if (ctx.pos.ch <= 0 || ctx.token.start <= 0) {
             //move up a line
             if (ctx.pos.line <= 0) {
@@ -64,17 +70,23 @@ define(function (require, exports, module) {
         } else {
             ctx.pos.ch = ctx.token.start;
         }
-        ctx.token = ctx.editor.getTokenAt(ctx.pos, true);
+        ctx.token = ctx.editor.getTokenAt(ctx.pos, precise);
         return true;
     }
     
     /**
      * Moves the given context forward by one token.
      * @param {editor:{CodeMirror}, pos:{ch:{string}, line:{number}}, token:{object}} ctx
+     * @param {boolean=} precise If code is being edited, use true (default) for accuracy.
+     *      If parsing unchanging code, use false to use cache for performance.
      * @return {boolean} whether the context changed
      */
-    function moveNextToken(ctx) {
+    function moveNextToken(ctx, precise) {
         var eol = ctx.editor.getLine(ctx.pos.line).length;
+        if (precise === undefined) {
+            precise = true;
+        }
+        
         if (ctx.pos.ch >= eol || ctx.token.end >= eol) {
             //move down a line
             if (ctx.pos.line >= ctx.editor.lineCount() - 1) {
@@ -85,7 +97,7 @@ define(function (require, exports, module) {
         } else {
             ctx.pos.ch = ctx.token.end + 1;
         }
-        ctx.token = ctx.editor.getTokenAt(ctx.pos, true);
+        ctx.token = ctx.editor.getTokenAt(ctx.pos, precise);
         return true;
     }
     
