DevTools: [Documentation] Update parser for WikiText

Source/devtools/front_end/documentation/DocumentationView.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.View}
  */
 WebInspector.DocumentationView = function()
 {
     WebInspector.View.call(this);
     this.element.classList.add("documentation-view");
     this.registerRequiredCSS("documentationView.css");
 }
 
 /**
  * @param {string} url
  * @param {string} searchItem
  */
 WebInspector.DocumentationView.showDocumentationURL = function(url, searchItem)
 {
     if (!WebInspector.DocumentationView._view)
         WebInspector.DocumentationView._view = new WebInspector.DocumentationView();
     var view = WebInspector.DocumentationView._view;
+    view.element.removeChildren();
     WebInspector.inspectorView.showCloseableViewInDrawer("documentation", WebInspector.UIString("Documentation"), view);
     view.showDocumentation(url, searchItem);
 }
 
 WebInspector.DocumentationView._languageToMimeType = {
     "javascript": "text/javascript",
     "html": "text/html"
 };
 
 WebInspector.DocumentationView.prototype = {
@@ skipping 19 matching lines @@
     _createArticle: function(searchItem, responseText)
     {
         var json = JSON.parse(responseText);
         var pages = json["query"]["pages"];
         var wikiKeys = Object.keys(pages);
         if (wikiKeys.length === 1 && wikiKeys[0] === "-1") {
             this._createEmptyPage();
             return;
         }
         var wikiMarkupText = pages[wikiKeys[0]]["revisions"]["0"]["*"];
-        var article = WebInspector.JSArticle.parse(wikiMarkupText);
+        var article;
+        try {
+            article = WebInspector.JSArticle.parse(wikiMarkupText);
+        } catch (error) {
+            console.error("Article could not be parsed. " + error.message);
+        }
         if (!article) {
             this._createEmptyPage();
             return;
         }
 
+        this.element.removeChildren();
         var renderer = new WebInspector.DocumentationView.Renderer(article, searchItem);
-        this.element.removeChildren();
         this.element.appendChild(renderer.renderJSArticle());
     },
 
     _createEmptyPage: function()
     {
         this.element.removeChildren();
         var emptyPage = this.element.createChild("div", "documentation-empty-page fill");
         var pageTitle = emptyPage.createChild("div", "documentation-not-found");
         pageTitle.textContent = "No documentation found.";
         emptyPage.createChild("div", "documentation-empty-page-align");
@@ skipping 82 matching lines @@
         if (!method)
             return;
         var section = this._element.createChild("p", "documentation-section");
         var signature = section.createChild("span", "documentation-method-signature documentation-section-content monospace");
         var methodName = signature.createChild("span", "documentation-method-name");
         methodName.textContent = this._searchItem.split(".").peekLast() + "(";
         for (var i = 0; i < parameters.length; ++i) {
             if (i > 0)
                 signature.createTextChild(", ")
             var parameterType = signature.createChild("span", "documentation-parameter-data-type-value");
-            parameterType.textContent = parameters[i].dataType + (parameters[i].optional ? "=" : "");;
+            parameterType.textContent = parameters[i].dataType + (parameters[i].optional ? "=" : "");
         }
         signature.createTextChild("): ");
         var returnTypeElement = signature.createChild("span", "documentation-parameter-data-type-value");
         returnTypeElement.textContent = method.returnValueName;
     },
 
     /**
      * @param {!Array.<!WebInspector.JSArticle.Parameter>} parameters
      */
     _createParametersSection: function(parameters)
@@ skipping 66 matching lines @@
             code.textContent = examples[i].code;
             if (!examples[i].language)
                 continue;
             var syntaxHighlighter = new WebInspector.DOMSyntaxHighlighter(WebInspector.DocumentationView._languageToMimeType[examples[i].language.toLowerCase()], true);
             syntaxHighlighter.syntaxHighlightNode(code);
         }
     },
 
     /**
      * @param {!WebInspector.WikiParser.ArticleElement} article
-     * @return {!Element}
+     * @return {?Element}
      */
     _renderBlock: function(article)
     {
-        var element;
+        var element = null;
         var elementTypes = WebInspector.WikiParser.ArticleElement.Type;
 
         switch (article.type()) {
         case elementTypes.Inline:
             element = document.createElement("span");
             break;
         case elementTypes.Link:
             element = document.createElementWithClass("a", "documentation-link");
             element.href = article.url();
             if (!article.children().length)
                 element.textContent = article.url();
             break;
         case elementTypes.Code:
             element = document.createElementWithClass("span", "documentation-code-tag");
             break;
         case elementTypes.CodeBlock:
             element = document.createElementWithClass("pre", "documentation-code source-code");
             element.textContent = article.code();
             break;
         case elementTypes.PlainText:
             element = document.createElement("span");
             element.textContent = article.text();
             if (article.isHighlighted())
                 element.classList.add("documentation-highlighted-text");
             break;
-        default:
-            console.error("Unknown ArticleElement type " + article.type());
         case elementTypes.Block:
             element = document.createElement(article.hasBullet() ? "li" : "p");
             break;
+        default:
+            console.error("Unknown ArticleElement type " + article.type());

[lushnikov, 2014/09/12 06:39:29]

don't you want to return null here as well?

[iliia, 2014/09/12 08:46:41]

Done.

         }
 
-        if (article instanceof WebInspector.WikiParser.Block || article instanceof WebInspector.WikiParser.Inline) {
+        if (article.type() === WebInspector.WikiParser.ArticleElement.Type.Block
+            || article.type() === WebInspector.WikiParser.ArticleElement.Type.Code
+            || article.type() === WebInspector.WikiParser.ArticleElement.Type.Inline) {
             for (var i = 0; i < article.children().length; ++i) {
                 var child = this._renderBlock(article.children()[i]);
                 if (child)
                     element.appendChild(child);
             }
         }
 
         return element;
     }
 }
@@ skipping 61 matching lines @@
         function computeDescriptors(column)
         {
             var token = textEditor.tokenAtTextPosition(textSelection.startLine, column);
             if (!token)
                 return [];
             var tokenText = textEditor.line(textSelection.startLine).substring(token.startColumn, token.endColumn);
             return urlProvider.itemDescriptors(tokenText);
         }
     }
 }