From d9c69a0975f5790376d12c79f016eb3ade6a2f1a Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Sat, 26 May 2012 13:11:06 +0200
Subject: [PATCH] improve performance of DocPanel by returning tokens (not
 source) from Ox.doc and making Ox.SyntaxHighlighter accept tokens

---
 source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js |  9 ++++-----
 source/Ox/js/JavaScript.js                   | 10 ++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
index b29e5f4b..cbff321d 100644
--- a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
+++ b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
@@ -13,7 +13,7 @@ Ox.SyntaxHighlighter <f:Ox.Element> Syntax Highlighter
         showLineNumbers <b|false> If true, show line numbers
         showWhitespace <b|false> If true, show whitespace
         showTabs <b|false> If true, show tabs
-        source <s|''> JavaScript source
+        source <s|[o]|''> JavaScript source, or array of tokens
         stripComments <b|false> If true, strip comments
         tabSize <n|4> Number of spaces per tab
     self <o> Shared private variable
@@ -52,10 +52,9 @@ Ox.SyntaxHighlighter = function(options, self) {
                 '<span class="OxTab">\u2192</span>' : ''
             ) + Ox.repeat('&nbsp;', self.options.tabSize - self.options.showTabs),
             whitespace = self.options.showWhitespace ? '\u00B7' : '&nbsp;';
-        self.options.source = self.options.source
-            .replace(/\r\n/g, '\n')
-            .replace(/\r/g, '\n');
-        tokens = Ox.tokenize(self.options.source);
+        tokens = Ox.isArray(self.options.source)
+            ? self.options.source
+            : Ox.tokenize(self.options.source);
         tokens.forEach(function(token, i) {
             var classNames,
                 type = token.type == 'identifier'
diff --git a/source/Ox/js/JavaScript.js b/source/Ox/js/JavaScript.js
index e781f8c7..3bba0132 100644
--- a/source/Ox/js/JavaScript.js
+++ b/source/Ox/js/JavaScript.js
@@ -18,7 +18,11 @@ Ox.doc <f> Generates documentation for annotated JavaScript
             <code>"event"</code>, <code>"function"</code>
             or <code>"object"</code>.
         section <s|u> Section in the file
-        source <s> Source code
+        source <[o]> Source code (array of tokens)
+            column <n> Column
+            line <n> Line
+            type <s> Type (see Ox.tokenize for a list of types)
+            value <s> Value
         summary <s> One-line summary
         usage <[o]> Usage (array of doc objects)
             Present if the <code>type</code> of the item is
@@ -156,9 +160,7 @@ Ox.doc = (function() {
                 if (/^[A-Z]/.test(item.name)) {
                     // main item
                     // include leading whitespace
-                    item.source = parseTokens(tokens[i]).map(function(token) {
-                        return token.value;
-                    }).join('');
+                    item.source = parseTokens(tokens[i]);
                     item.line = source.slice(0, item.source[0].offset)
                         .split('\n').length;
                     items.push(item);