Improve HTMLUtils.findBlocks performance

src/language/HTMLUtils.js

@@ -508,16 +508,19 @@ define(function (require, exports, module) {
      */
     function findBlocks(editor, modeName) {
         // Start scanning from beginning of file
-        var ctx = TokenUtils.getInitialContext(editor._codeMirror, {line: 0, ch: 0}),
-            blocks = [],
+        var blocks = [],
+            cm = editor._codeMirror,
             currentBlock = null,
             inBlock = false,
-            outerMode = editor._codeMirror.getMode(),
+            line,
+            lineCount = editor.lineCount(),
+            outerMode = cm.getMode(),
+            previousMode,
             tokenModeName,
-            previousMode;
+            tokens;
 
-        while (TokenUtils.moveNextToken(ctx, false)) {
-            tokenModeName = CodeMirror.innerMode(outerMode, ctx.token.state).mode.name;
+        function checkForBlock(ctx) {
+            tokenModeName = CodeMirror.innerMode(outerMode, ctx.state).mode.name;
             if (inBlock) {
                 if (!currentBlock.end) {
                     // Handle empty blocks
@@ -529,13 +532,13 @@ define(function (require, exports, module) {
                     currentBlock.text = editor.document.getRange(currentBlock.start, currentBlock.end);
                     inBlock = false;
                 } else {
-                    currentBlock.end = { line: ctx.pos.line, ch: ctx.pos.ch };
+                    currentBlock.end = { line: line, ch: ctx.end };
                 }
             } else {
                 // Check for start of a block
                 if (tokenModeName === modeName) {
                     currentBlock = {
-                        start: { line: ctx.pos.line, ch: ctx.pos.ch }
+                        start: { line: line, ch: ctx.end }
                     };
                     blocks.push(currentBlock);
                     inBlock = true;
@@ -546,6 +549,12 @@ define(function (require, exports, module) {
             }
         }
 
+        for (line = 0; line < lineCount; line++) {
+            tokens = cm.getLineTokens(line);
+            tokens.forEach(checkForBlock);
+            tokens = null; // Garbage collection - tokens can be pretty big
+        }
+
         return blocks;
     }