DevTools: [Documentation] Update parser for WikiText

Source/devtools/front_end/documentation/WikiParser.js

Index: Source/devtools/front_end/documentation/WikiParser.js
diff --git a/Source/devtools/front_end/documentation/WikiParser.js b/Source/devtools/front_end/documentation/WikiParser.js
index 63ffd0b26dfe091fdf601d30f81f95fc583100c0..7f2827a57212addc25dce6dc8cb160eadcf7fd11 100644
--- a/Source/devtools/front_end/documentation/WikiParser.js
+++ b/Source/devtools/front_end/documentation/WikiParser.js
@@ -8,72 +8,66 @@
  */
 WebInspector.WikiParser = function(wikiMarkupText)
 {
-    this._position = 0;
-    this._wikiMarkupText = wikiMarkupText;
+    var text = wikiMarkupText;
+    this._tokenizer = new WebInspector.WikiParser.Tokenizer(text);
     this._document = this._parse();
-    /** @type {?WebInspector.WikiParser.Tokenizer} */
-    this._tokenizer;
 }
 
 /**
- * @package
- * @enum {string}
+ * @constructor
  */
-WebInspector.WikiParser.State = {
-    Error: "Error",
-    FirstOpen: "FirstOpen",
-    SecondOpen: "SecondOpen",
-    Title: "Title",
-    PropertyName: "PropertyName",
-    PropertyValue: "PropertyValue",
-    FirstClose: "FirstClose",
-    SecondClose: "SecondClose"
-}
+WebInspector.WikiParser.Section = function()
+{
+    /** @type {string} */
+    this.title;
 
-/**
- * @package
- * @enum {string}
- */
-WebInspector.WikiParser.LinkStates = {
-    Error: "Error",
-    LinkUrl: "LinkUrl",
-    LinkName: "LinkName"
-}
+    /** @type {?WebInspector.WikiParser.Values} */
+    this.values;
 
-/**
- * @package
- * @enum {string}
- */
-WebInspector.WikiParser.HtmlStates = {
-    Error: "Error",
-    Entry: "Entry",
-    InsideTag: "InsideTag",
-    Exit: "Exit"
+    /** @type {?WebInspector.WikiParser.ArticleElement} */
+    this.singleValue;
 }
 
 /**
- * @package
- * @enum {string}
+ * @constructor
  */
-WebInspector.WikiParser.ValueState = {
-    Error: "Error",
-    Outside: "Outside",
-    InsideSquare: "InsideSquare"
+WebInspector.WikiParser.Field = function()
+{
+    /** @type {string} */
+    this.name;
+
+    /** @type {?WebInspector.WikiParser.FieldValue} */
+    this.value;
 }
 
+/** @typedef {(?WebInspector.WikiParser.ArticleElement|!Array.<!WebInspector.WikiParser.Section>)} */
+WebInspector.WikiParser.FieldValue;
+
+/** @typedef {?Object.<string, !WebInspector.WikiParser.FieldValue>} */
+WebInspector.WikiParser.Values;
+
+/** @typedef {(?WebInspector.WikiParser.Value|?WebInspector.WikiParser.ArticleElement)} */
+WebInspector.WikiParser.Value;
+
 /**
  * @package
  * @enum {string}
  */
 WebInspector.WikiParser.TokenType = {
-    TripleQuotes: "TripleQuotes",
+    Text: "Text",
+    Table: "Table",
+    OpeningBraces: "OpeningBraces",
+    ClosingBraces: "ClosingBraces",
+    Exclamation: "Exclamation",
     OpeningBrackets: "OpeningBrackets",
-    OpeningCodeTag: "OpeningCodeTag",
     ClosingBrackets: "ClosingBrackets",
+    EqualSign: "EqualSign",
+    EqualSignInBraces: "EqualSignInBraces",
+    VerticalLine: "VerticalLine",
+    TripleQuotes: "TripleQuotes",
+    OpeningCodeTag: "OpeningCodeTag",
     ClosingCodeTag: "ClosingCodeTag",
     Bullet: "Bullet",
-    Text: "Text",
-    VerticalLine: "VerticalLine",
     LineEnd: "LineEnd",
     CodeBlock: "CodeBlock"
 }
@@ -114,22 +108,41 @@ WebInspector.WikiParser.Token.prototype = {
 WebInspector.WikiParser.Tokenizer = function(str)
 {
     this._text = str;
+    this._token = this._internalNextToken();
 }
 
 WebInspector.WikiParser.Tokenizer.prototype = {
     /**
      * @return {!WebInspector.WikiParser.Token}
      */
-    _nextToken: function()
+    peekToken: function()
+    {
+        return this._token;
+    },
+
+    /**
+     * @return {!WebInspector.WikiParser.Token}
+     */
+    nextToken: function()
+    {
+        var token = this._token;
+        this._token = this._internalNextToken();
+        return token;
+    },
+
+    /**
+     * @return {!WebInspector.WikiParser.Token}
+     */
+    _internalNextToken: function()
     {
         if (WebInspector.WikiParser.newLineWithSpace.test(this._text)) {
             var result = WebInspector.WikiParser.newLineWithSpace.exec(this._text);
-            var begin = result.index + result[0].length;
+            var begin = result.index;
             var end = this._text.length;
             var lineEnd = WebInspector.WikiParser.newLineWithoutSpace.exec(this._text);
             if (lineEnd)
                 end = lineEnd.index;
-            var token = this._text.substring(begin, end).replace(/\n */g, "\n");
+            var token = this._text.substring(begin, end).replace(/\n /g, "\n").replace(/{{=}}/g, "=");
             this._text = this._text.substring(end + 1);
             return new WebInspector.WikiParser.Token(token, WebInspector.WikiParser.TokenType.CodeBlock);
         }
@@ -159,14 +172,75 @@ WebInspector.WikiParser.Tokenizer.prototype = {
     },
 
     /**
+     * @return {!WebInspector.WikiParser.Tokenizer}
+     */
+    clone: function()
+    {
+        var tokenizer = new WebInspector.WikiParser.Tokenizer(this._text);
+        tokenizer._token = this._token;
+        tokenizer._text = this._text;
+        return tokenizer;
+    },
+
+    /**
      * @return {boolean}
      */
-    _hasMoreTokens: function()
+    hasMoreTokens: function()
     {
         return !!this._text.length;
     }
 }
 
+WebInspector.WikiParser.table = /^{{{!}}/;
+WebInspector.WikiParser.exclamation = /^{{!}}/;
+WebInspector.WikiParser.openingBraces = /^{{/;
+WebInspector.WikiParser.equalSign = /^=/;
+WebInspector.WikiParser.equalSignInBraces = /^{{=}}/;
+WebInspector.WikiParser.closingBraces = /^\s*}}/;
+WebInspector.WikiParser.oneOpeningBracketWithSpace = /^\n* \[/;
+WebInspector.WikiParser.twoOpeningBracketsWithSpace = /^\n* \[\[/;
+WebInspector.WikiParser.oneClosingBracket = /^\n*\]/;
+WebInspector.WikiParser.twoClosingBrackets = /^\n*\]\]/;
+WebInspector.WikiParser.tripleQuotes = /^\n*'''/;
+WebInspector.WikiParser.openingCodeTag = /^<code\s*>/;
+WebInspector.WikiParser.closingCodeTag = /^<\/code\s*>/;
+WebInspector.WikiParser.closingBullet = /^\*/;
+WebInspector.WikiParser.lineEnd = /^\n/;
+WebInspector.WikiParser.verticalLine = /^\n*\|/;
+WebInspector.WikiParser.newLineWithSpace = /^\n [^ ]/;
+WebInspector.WikiParser.newLineWithoutSpace = /\n[^ ]/;
+
+/**
+ * @constructor
+ * @param {!RegExp} regex
+ * @param {!WebInspector.WikiParser.TokenType} type
+ */
+WebInspector.WikiParser.TokenDescriptor = function(regex, type)
+{
+    this.regex = regex;
+    this.type = type;
+}
+
+WebInspector.WikiParser._tokenDescriptors = [
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.exclamation, WebInspector.WikiParser.TokenType.Exclamation),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.equalSignInBraces, WebInspector.WikiParser.TokenType.EqualSignInBraces),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.equalSign, WebInspector.WikiParser.TokenType.EqualSign),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.table, WebInspector.WikiParser.TokenType.Table),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.openingBraces, WebInspector.WikiParser.TokenType.OpeningBraces),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.verticalLine, WebInspector.WikiParser.TokenType.VerticalLine),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.closingBraces, WebInspector.WikiParser.TokenType.ClosingBraces),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.twoOpeningBracketsWithSpace, WebInspector.WikiParser.TokenType.OpeningBrackets),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.twoClosingBrackets, WebInspector.WikiParser.TokenType.ClosingBrackets),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.oneOpeningBracketWithSpace, WebInspector.WikiParser.TokenType.OpeningBrackets),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.oneClosingBracket, WebInspector.WikiParser.TokenType.ClosingBrackets),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.newLineWithSpace, WebInspector.WikiParser.TokenType.CodeBlock),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.tripleQuotes, WebInspector.WikiParser.TokenType.TripleQuotes),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.openingCodeTag, WebInspector.WikiParser.TokenType.OpeningCodeTag),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.closingCodeTag, WebInspector.WikiParser.TokenType.ClosingCodeTag),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.closingBullet, WebInspector.WikiParser.TokenType.Bullet),
+    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.lineEnd, WebInspector.WikiParser.TokenType.LineEnd)
+]
+
 WebInspector.WikiParser.prototype = {
     /**
      * @return {!Object}
@@ -177,199 +251,206 @@ WebInspector.WikiParser.prototype = {
     },
 
     /**
-     * @return {!Object}
+     * @return {?WebInspector.WikiParser.TokenType}
+     */
+    _secondTokenType: function()
+    {
+        var tokenizer = this._tokenizer.clone();
+        if (!tokenizer.hasMoreTokens())
+            return null;
+        tokenizer.nextToken();
+        if (!tokenizer.hasMoreTokens())
+            return null;
+        return tokenizer.nextToken().type();
+    },
+
+    /**
+     * @return {!Object.<string, ?WebInspector.WikiParser.Value>}
      */
     _parse: function()
     {
         var obj = {};
-        this._wikiMarkupText = this._wikiMarkupText.replace(/&lt;/g, "<")
-                      .replace(/&gt;/g, ">")
-                      .replace(/&#58;/g, ":")
-                      .replace(/&quot;/g, "\"")
-                      .replace(/&#60;/g, "<")
-                      .replace(/&#62;/g, ">")
-                      .replace(/{{=}}/g, "=")
-                      .replace(/{{!}}/g, "|")
-                      .replace(/&amp;/g, "&");
-        while (this._position < this._wikiMarkupText.length) {
-            var field = this._parseField();
-            for (var key in field) {
-                console.assert(typeof obj[key] === "undefined", "Duplicate key: " + key);
-                obj[key] = field[key];
-            }
+        while (this._tokenizer.hasMoreTokens()) {
+            var section = this._parseSection();
+            if (section.title)
+                obj[section.title] = section.singleValue || section.values;
         }
         return obj;
     },
 
     /**
-     * @return {string}
+     * @return {!WebInspector.WikiParser.Section}
      */
-    _parseValue: function() {
-        var states = WebInspector.WikiParser.ValueState;
-        var state = states.Outside;
-        var value = "";
-        while (this._position < this._wikiMarkupText.length) {
-            switch (state) {
-            case states.Outside:
-                if (this._wikiMarkupText[this._position] === "|" || (this._wikiMarkupText[this._position] === "}" && this._wikiMarkupText[this._position + 1] === "}"))
-                    return value;
-                switch (this._wikiMarkupText[this._position]) {
-                case "<":
-                    var indexClose = this._wikiMarkupText.indexOf(">", this._position);
-                    if (indexClose !== -1) {
-                        value += this._wikiMarkupText.substring(this._position, indexClose + 1);
-                        this._position = indexClose;
-                    }
-                    break;
-                case "[":
-                    state = states.InsideSquare;
-                    value += this._wikiMarkupText[this._position];
-                    break;
-                default:
-                    value += this._wikiMarkupText[this._position];
-                }
-                break;
-            case states.InsideSquare:
-                if (this._wikiMarkupText[this._position] === "[") {
-                    var indexClose = this._wikiMarkupText.indexOf("]]", this._position);
-                    if (indexClose !== -1) {
-                        value += this._wikiMarkupText.substring(this._position, indexClose + 2);
-                        this._position = indexClose + 1;
-                    }
-                } else {
-                    var indexClose = this._wikiMarkupText.indexOf("]", this._position);
-                    if (indexClose !== -1) {
-                        value += this._wikiMarkupText.substring(this._position, indexClose + 1);
-                        this._position = indexClose;
-                    }
+    _parseSection: function()
+    {
+        var section = new WebInspector.WikiParser.Section();
+        if (!this._tokenizer.hasMoreTokens() || this._tokenizer.nextToken().type() !== WebInspector.WikiParser.TokenType.OpeningBraces)
+            return section;
+
+        var title = this._deleteTrailingSpaces(this._parseSectionTitle());
+        if (!title.length)
+            return section;
+        section.title = title;
+        if (this._tokenizer.peekToken().type() === WebInspector.WikiParser.TokenType.ClosingBraces) {
+            this._tokenizer.nextToken();
+            return section;
+        }
+        var secondTokenType = this._secondTokenType();
+        if (!secondTokenType || secondTokenType !== WebInspector.WikiParser.TokenType.EqualSign) {
+            section.singleValue = this._parseMarkupText();
+        } else {
+            section.values = {};
+            while (this._tokenizer.hasMoreTokens()) {
+                var field = this._parseField();
+                section.values[field.name] = field.value;
+                if (this._tokenizer.peekToken().type() === WebInspector.WikiParser.TokenType.ClosingBraces) {
+                    this._tokenizer.nextToken();
+                    return section;
                 }
-                state = states.Outside;
-                break;
             }
-            this._position++;
         }
-        return value;
+        var token = this._tokenizer.nextToken();
+        if (token.type() !== WebInspector.WikiParser.TokenType.ClosingBraces)
+            throw new Error("Two closing braces expected; found " + token.value());
+
+        return section;
     },
 
     /**
-     * @return {!Object}
+     * @return {!WebInspector.WikiParser.Field}
      */
     _parseField: function()
     {
-        var obj = {};
+        var field = new WebInspector.WikiParser.Field();
+        field.name = this._parseFieldName();
+        var token = this._tokenizer.peekToken();
+        switch (token.type()) {
+        case WebInspector.WikiParser.TokenType.OpeningBraces:
+            field.value = this._parseArray();
+            break;
+        case WebInspector.WikiParser.TokenType.LineEnd:
+            this._tokenizer.nextToken();
+            break;
+        case WebInspector.WikiParser.TokenType.ClosingBraces:
+            return field;
+        default:
+            if (field.name.toUpperCase() === "CODE")
+                field.value = this._parseExampleCode();
+            else
+                field.value = this._parseMarkupText();
+        }
+        return field;
+    },
+
+    /**
+     * @return {!Array.<!WebInspector.WikiParser.Section>}
+     */
+    _parseArray: function()
+    {
+        var array = [];
+        while (this._tokenizer.peekToken().type() === WebInspector.WikiParser.TokenType.OpeningBraces)
+            array.push(this._parseSection());
+        if (this._tokenizer.peekToken().type() === WebInspector.WikiParser.TokenType.VerticalLine)
+            this._tokenizer.nextToken();
+        return array;
+    },
+
+    /**
+     * @return {string}
+     */
+    _parseSectionTitle: function()
+    {
         var title = "";
-        var propertyName = "";
-        var propertyValue = "";
-        var states = WebInspector.WikiParser.State;
-        var state = states.FirstOpen;
-        while (this._position < this._wikiMarkupText.length) {
-            var skipIncrement = false;
-            switch (state) {
-            case states.FirstOpen:
-                if (this._wikiMarkupText[this._position] === "{")
-                    state = states.SecondOpen;
-                else
-                    state = states.Error;
-                break;
-            case states.SecondOpen:
-                if (this._wikiMarkupText[this._position] === "{")
-                    state = states.Title;
-                else
-                    state = states.Error;
-                break;
-            case states.Title:
-                if (this._wikiMarkupText[this._position] === "|") {
-                    title = this._deleteTrailingSpaces(title);
-                    if (title !== "")
-                        obj[title] = {};
-                    state = states.PropertyName;
-                } else if (this._wikiMarkupText[this._position] === "}") {
-                    title = this._deleteTrailingSpaces(title);
-                    if (title !== "")
-                        obj[title] = {};
-                    state = states.FirstClose;
-                } else {
-                    title += (this._wikiMarkupText[this._position] === "\n" ? "" : this._wikiMarkupText[this._position]);
-                }
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.peekToken();
+            switch (token.type()) {
+            case WebInspector.WikiParser.TokenType.ClosingBraces:
+                return title;
+            case WebInspector.WikiParser.TokenType.VerticalLine:
+                this._tokenizer.nextToken();
+                return title;
+            case WebInspector.WikiParser.TokenType.Text:
+                title += this._tokenizer.nextToken().value();
                 break;
-            case states.PropertyName:
-                if (this._wikiMarkupText[this._position] === "=") {
-                    state = states.PropertyValue;
-                    this._deleteTrailingSpaces(propertyName);
-                    if (propertyName !== "")
-                        obj[title][propertyName] = [];
-                } else {
-                    if (this._wikiMarkupText[this._position] === "}") {
-                        propertyName = this._deleteTrailingSpaces(propertyName);
-                        obj[title] = propertyName;
-                        state = states.FirstClose;
-                    } else {
-                        propertyName += this._wikiMarkupText[this._position];
-                    }
-                }
+            default:
+                throw new Error("Title could not be parsed. Unexpected token " + token.value());
+            }
+        }
+        return title;
+    },
+
+    /**
+     * @return {string}
+     */
+    _parseFieldName: function()
+    {
+        var name = "";
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.peekToken();
+            switch (token.type()) {
+            case WebInspector.WikiParser.TokenType.ClosingBraces:
+                return name;
+            case WebInspector.WikiParser.TokenType.EqualSign:
+                this._tokenizer.nextToken();
+                return name;
+            case WebInspector.WikiParser.TokenType.VerticalLine:
+            case WebInspector.WikiParser.TokenType.Text:
+                name += this._tokenizer.nextToken().value();
                 break;
-            case states.PropertyValue:
-                if (this._wikiMarkupText[this._position] === "{" && this._wikiMarkupText[this._position + 1] === "{") {
-                    propertyValue = this._parseField();
-                    obj[title][propertyName].push(propertyValue);
-                    propertyValue = "";
-                    skipIncrement = true;
-                } else if (this._wikiMarkupText[this._position] === "|") {
-                    propertyValue = this._deleteTrailingSpaces(propertyValue);
-                    if (propertyValue !== "")
-                      obj[title][propertyName] = propertyValue;
-
-                    state = states.PropertyName;
-                    if (Array.isArray(obj[title][propertyName]) && obj[title][propertyName].length === 1) {
-                        var newObj = obj[title][propertyName][0];
-                        obj[title][propertyName] = newObj;
-                    }
-
-                    propertyName = "";
-                    propertyValue = "";
-                } else if (this._position + 1 < this._wikiMarkupText.length && this._wikiMarkupText[this._position] === "}" && this._wikiMarkupText[this._position + 1] === "}") {
-                    propertyValue = this._deleteTrailingSpaces(propertyValue);
-                    if (propertyValue !== "")
-                        obj[title][propertyName].push(propertyValue);
-                    if (Array.isArray(obj[title][propertyName]) && obj[title][propertyName].length === 1) {
-                        var newObj = obj[title][propertyName][0];
-                        obj[title][propertyName] = newObj;
-                    }
-
-                    propertyValue = "";
-                    state = states.FirstClose;
-                } else {
-                    propertyValue = this._parseValue();
-                    skipIncrement = true;
-                }
+            default:
+                throw new Error("Name could not be parsed. Unexpected token " + token.value());
+            }
+        }
+        return name;
+    },
+
+    /**
+     * @return {!WebInspector.WikiParser.Block}
+     */
+    _parseExampleCode: function()
+    {
+        var code = "";
+
+        /**
+         * @return {!WebInspector.WikiParser.Block}
+         */
+        function wrapIntoArticleElement()
+        {
+            var plainText = new WebInspector.WikiParser.PlainText(code);
+            var block = new WebInspector.WikiParser.Block([plainText])
+            var articleElement = new WebInspector.WikiParser.Block([block]);
+            return articleElement;
+        }
+
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.peekToken();
+            switch (token.type()) {
+            case WebInspector.WikiParser.TokenType.ClosingBraces:
+                return wrapIntoArticleElement();
+            case WebInspector.WikiParser.TokenType.VerticalLine:
+                this._tokenizer.nextToken();
+                return wrapIntoArticleElement();
+            case WebInspector.WikiParser.TokenType.Exclamation:
+                this._tokenizer.nextToken();
+                code += "|";
                 break;
-            case states.FirstClose:
-                if (this._wikiMarkupText[this._position] === "}")
-                    state = states.SecondClose;
-                else
-                    state = states.Error;
+            case WebInspector.WikiParser.TokenType.EqualSignInBraces:
+                this._tokenizer.nextToken();
+                code += "=";
                 break;
-            case states.SecondClose:
-                while (this._position < this._wikiMarkupText.length && this._wikiMarkupText[this._position] === "\n")
-                    this._position++;
-                return obj;
-            case states.Error:
-                this._position = this._wikiMarkupText.length;
-                return {};
+            default:
+                this._tokenizer.nextToken();
+                code += token.value();
             }
-            if (!skipIncrement)
-                this._position++;
         }
-        return obj;
+        return wrapIntoArticleElement();
     },
 
     /**
-     * @param {string} str
      * @return {?WebInspector.WikiParser.Block}
      */
-    parseString: function(str)
+    _parseMarkupText: function()
     {
-        this._tokenizer = new WebInspector.WikiParser.Tokenizer(str);
         var children = [];
         var blockChildren = [];
         var text = "";
@@ -380,7 +461,7 @@ WebInspector.WikiParser.prototype = {
             var currentText = self._deleteTrailingSpaces(text);
             if (!currentText.length)
                 return;
-            var simpleText = new WebInspector.WikiParser.PlainText(currentText, false);
+            var simpleText = new WebInspector.WikiParser.PlainText(currentText);
             blockChildren.push(simpleText);
             text = "";
         }
@@ -388,49 +469,75 @@ WebInspector.WikiParser.prototype = {
         function processBlock()
         {
             if (blockChildren.length) {
-                children.push(new WebInspector.WikiParser.Block(blockChildren, false));
+                children.push(new WebInspector.WikiParser.Block(blockChildren));
                 blockChildren = [];
             }
         }
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken();
+
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.peekToken();
             switch (token.type()) {
+            case WebInspector.WikiParser.TokenType.VerticalLine:
+            case WebInspector.WikiParser.TokenType.ClosingBraces:
+                if (token.type() === WebInspector.WikiParser.TokenType.VerticalLine)
+                    this._tokenizer.nextToken();
+                processSimpleText();
+                processBlock();
+                return new WebInspector.WikiParser.Block(children);
             case WebInspector.WikiParser.TokenType.TripleQuotes:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 var highlightText = this._parseHighlight();
                 blockChildren.push(highlightText)
                 break;
             case WebInspector.WikiParser.TokenType.OpeningBrackets:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 var link = this._parseLink();
                 blockChildren.push(link);
                 break;
             case WebInspector.WikiParser.TokenType.OpeningCodeTag:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 var code = this._parseCode();
                 blockChildren.push(code);
                 break;
             case WebInspector.WikiParser.TokenType.Bullet:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 processBlock();
                 var bulletText = this._parseBullet();
                 children.push(bulletText);
                 break;
             case WebInspector.WikiParser.TokenType.CodeBlock:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 processBlock();
-                var code = new WebInspector.WikiParser.CodeBlock(token.value());
+                var code = new WebInspector.WikiParser.CodeBlock(this._trimLeadingNewLines(token.value()));
                 children.push(code);
                 break;
             case WebInspector.WikiParser.TokenType.LineEnd:
+                this._tokenizer.nextToken();
                 processSimpleText();
                 processBlock();
                 break;
-            case WebInspector.WikiParser.TokenType.VerticalLine:
+            case WebInspector.WikiParser.TokenType.EqualSignInBraces:
+                this._tokenizer.nextToken();
+                text += "=";
+                break;
+            case WebInspector.WikiParser.TokenType.Exclamation:
+                this._tokenizer.nextToken();
+                text += "|";
+                break;
+            case WebInspector.WikiParser.TokenType.ClosingBrackets:
             case WebInspector.WikiParser.TokenType.Text:
+            case WebInspector.WikiParser.TokenType.EqualSign:
+            case WebInspector.WikiParser.TokenType.Table:
+                this._tokenizer.nextToken();
                 text += token.value();
                 break;
             default:
+                this._tokenizer.nextToken();
                 return null;
             }
         }
@@ -438,7 +545,7 @@ WebInspector.WikiParser.prototype = {
         processSimpleText();
         processBlock();
 
-        return new WebInspector.WikiParser.Block(children, false);
+        return new WebInspector.WikiParser.Block(children);
     },
 
     /**
@@ -448,12 +555,13 @@ WebInspector.WikiParser.prototype = {
     {
         var url = "";
         var children = [];
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken();
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.nextToken();
             switch (token.type()) {
             case WebInspector.WikiParser.TokenType.ClosingBrackets:
                 return new WebInspector.WikiParser.Link(url, children);
             case WebInspector.WikiParser.TokenType.VerticalLine:
+            case WebInspector.WikiParser.TokenType.Exclamation:
                 children.push(this._parseLinkName());
                 return new WebInspector.WikiParser.Link(url, children);
             default:
@@ -470,16 +578,30 @@ WebInspector.WikiParser.prototype = {
     _parseLinkName: function()
     {
         var children = [];
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken();
+        var text = "";
+        var self = this;
+        function processSimpleText()
+        {
+            text = self._deleteTrailingSpaces(text);
+            if (!text.length)
+                return;
+            var simpleText = new WebInspector.WikiParser.PlainText(text);
+            children.push(simpleText);
+            text = "";
+        }
+
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.nextToken();
             switch (token.type()) {
             case WebInspector.WikiParser.TokenType.ClosingBrackets:
+                processSimpleText();
                 return new WebInspector.WikiParser.Inline(WebInspector.WikiParser.ArticleElement.Type.Inline, children);
             case WebInspector.WikiParser.TokenType.OpeningCodeTag:
+                processSimpleText();
                 children.push(this._parseCode());
                 break;
             default:
-                children.push(new WebInspector.WikiParser.PlainText(token.value(), false));
+                text += token.value();
                 break;
             }
         }
@@ -494,13 +616,13 @@ WebInspector.WikiParser.prototype = {
     {
         var children = [];
         var text = "";
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken();
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.nextToken();
             switch (token.type()) {
             case WebInspector.WikiParser.TokenType.ClosingCodeTag:
                 text = this._deleteTrailingSpaces(text);
                 if (text.length) {
-                    var simpleText = new WebInspector.WikiParser.PlainText(text, false);
+                    var simpleText = new WebInspector.WikiParser.PlainText(text);
                     children.push(simpleText);
                     text = "";
                 }
@@ -517,7 +639,7 @@ WebInspector.WikiParser.prototype = {
 
         text = this._deleteTrailingSpaces(text);
         if (text.length)
-            children.push(new WebInspector.WikiParser.PlainText(text, false));
+            children.push(new WebInspector.WikiParser.PlainText(text));
 
         return new WebInspector.WikiParser.Inline(WebInspector.WikiParser.ArticleElement.Type.Code, children);
     },
@@ -528,8 +650,8 @@ WebInspector.WikiParser.prototype = {
     _parseBullet: function()
     {
         var children = [];
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken()
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.nextToken()
             switch (token.type()) {
             case WebInspector.WikiParser.TokenType.OpeningBrackets:
                 children.push(this._parseLink());
@@ -542,7 +664,7 @@ WebInspector.WikiParser.prototype = {
             default:
                 var text = this._deleteTrailingSpaces(token.value());
                 if (text.length) {
-                    var simpleText = new WebInspector.WikiParser.PlainText(text, false);
+                    var simpleText = new WebInspector.WikiParser.PlainText(text);
                     children.push(simpleText);
                     text = "";
                 }
@@ -558,8 +680,8 @@ WebInspector.WikiParser.prototype = {
     _parseHighlight: function()
     {
         var text = "";
-        while (this._tokenizer._hasMoreTokens()) {
-            var token = this._tokenizer._nextToken()
+        while (this._tokenizer.hasMoreTokens()) {
+            var token = this._tokenizer.nextToken()
             switch (token.type()) {
             case WebInspector.WikiParser.TokenType.TripleQuotes:
                 text = this._deleteTrailingSpaces(text);
@@ -578,47 +700,18 @@ WebInspector.WikiParser.prototype = {
     _deleteTrailingSpaces: function(str)
     {
         return str.replace(/[\n\r]*$/gm, "");
-    }
-}
-
-WebInspector.WikiParser.oneOpeningBracket = /^\n* \[[^\[]/;
-WebInspector.WikiParser.twoOpeningBrackets = /^\n* \[\[/;
-WebInspector.WikiParser.oneClosingBracket = /^\n*\][^\]] /;
-WebInspector.WikiParser.twoClosingBrackets = /^\n*\]\]/;
-WebInspector.WikiParser.tripleQuotes = /^\n*'''/;
-WebInspector.WikiParser.openingCodeTag = /^<\s*code\s*>/;
-WebInspector.WikiParser.closingCodeTag = /^<\s*\/\s*code\s*>/;
-WebInspector.WikiParser.closingBullet = /^\*/;
-WebInspector.WikiParser.lineEnd = /^\n/;
-WebInspector.WikiParser.verticalLine = /^\|/;
-WebInspector.WikiParser.newLineWithSpace = /^\n /;
-WebInspector.WikiParser.newLineWithoutSpace = /\n[^ ]/;
+    },
 
-/**
- * @constructor
- * @param {!RegExp} regex
- * @param {!WebInspector.WikiParser.TokenType} type
- */
-WebInspector.WikiParser.TokenDescriptor = function(regex, type)
-{
-    this.regex = regex;
-    this.type = type;
+    /**
+     * @param {string} str
+     * @return {string}
+     */
+    _trimLeadingNewLines: function(str)
+    {
+        return str.replace(/^\n*/, "");
+    }
 }
 
-WebInspector.WikiParser._tokenDescriptors = [
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.newLineWithSpace, WebInspector.WikiParser.TokenType.CodeBlock),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.tripleQuotes, WebInspector.WikiParser.TokenType.TripleQuotes),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.oneOpeningBracket, WebInspector.WikiParser.TokenType.OpeningBrackets),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.twoOpeningBrackets, WebInspector.WikiParser.TokenType.OpeningBrackets),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.oneClosingBracket, WebInspector.WikiParser.TokenType.ClosingBrackets),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.twoClosingBrackets, WebInspector.WikiParser.TokenType.ClosingBrackets),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.openingCodeTag, WebInspector.WikiParser.TokenType.OpeningCodeTag),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.closingCodeTag, WebInspector.WikiParser.TokenType.ClosingCodeTag),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.closingBullet, WebInspector.WikiParser.TokenType.Bullet),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.verticalLine, WebInspector.WikiParser.TokenType.VerticalLine),
-    new WebInspector.WikiParser.TokenDescriptor(WebInspector.WikiParser.lineEnd, WebInspector.WikiParser.TokenType.LineEnd)
-];
-
 /**
  * @constructor
  * @param {!WebInspector.WikiParser.ArticleElement.Type} type
@@ -654,20 +747,20 @@ WebInspector.WikiParser.ArticleElement.Type = {
  * @constructor
  * @extends {WebInspector.WikiParser.ArticleElement}
  * @param {string} text
- * @param {boolean} highlight
+ * @param {boolean=} highlight
  */
 WebInspector.WikiParser.PlainText = function(text, highlight)
 {
     WebInspector.WikiParser.ArticleElement.call(this, WebInspector.WikiParser.ArticleElement.Type.PlainText);
-    this._text = text;
-    this._isHighlighted = highlight;
+    this._text = text.unescapeHTML();
+    this._isHighlighted = highlight || false;
 }
 
 WebInspector.WikiParser.PlainText.prototype = {
     /**
      * @return {string}
      */
-    text : function()
+    text: function()
     {
         return this._text;
     },
@@ -687,13 +780,13 @@ WebInspector.WikiParser.PlainText.prototype = {
  * @constructor
  * @extends {WebInspector.WikiParser.ArticleElement}
  * @param {!Array.<!WebInspector.WikiParser.ArticleElement>} children
- * @param {boolean} hasBullet
+ * @param {boolean=} hasBullet
  */
 WebInspector.WikiParser.Block = function(children, hasBullet)
 {
     WebInspector.WikiParser.ArticleElement.call(this, WebInspector.WikiParser.ArticleElement.Type.Block);
     this._children = children;
-    this._hasBullet = hasBullet
+    this._hasBullet = hasBullet || false;
 }
 
 WebInspector.WikiParser.Block.prototype = {
@@ -708,6 +801,14 @@ WebInspector.WikiParser.Block.prototype = {
     /**
      * @return {boolean}
      */
+    hasChildren: function()
+    {
+        return !!this._children && !!this._children.length;
+    },
+
+    /**
+     * @return {boolean}
+     */
     hasBullet: function()
     {
         return this._hasBullet;
@@ -724,7 +825,7 @@ WebInspector.WikiParser.Block.prototype = {
 WebInspector.WikiParser.CodeBlock = function(text)
 {
     WebInspector.WikiParser.ArticleElement.call(this, WebInspector.WikiParser.ArticleElement.Type.CodeBlock);
-    this._code = text;
+    this._code = text.unescapeHTML();
 }
 
 WebInspector.WikiParser.CodeBlock.prototype = {