Update docdown & qunit-clib. [ci skip]

Author: jdalton

vendor/docdown/src/DocDown/Entry.php

@@ -77,7 +77,8 @@ private function isFunction() {
         $this->isCtor() ||
         count($this->getParams()) ||
         count($this->getReturns()) ||
-        preg_match('/\*[\t ]*@function\b/', $this->entry)
+        preg_match('/\*[\t ]*@function\b/', $this->entry) ||
+        preg_match('#\*/\s*function #', $this->entry)
       );
     }
     return $this->_isFunction;

vendor/docdown/src/DocDown/MarkdownGenerator.php

@@ -27,7 +27,6 @@ class MarkdownGenerator {
   /**
    * The HTML for the open tag.
    *
-   * @static
    * @memberOf MarkdownGenerator
    * @type string
    */
@@ -49,6 +48,15 @@ class MarkdownGenerator {
    */
   public $source = '';
 
+  /**
+   * The array of code snippets that are tokenized by `escape`.
+   *
+   * @private
+   * @memberOf MarkdownGenerator
+   * @type Array
+   */
+  private $snippets = array();
+
   /*--------------------------------------------------------------------------*/
 
   /**
@@ -132,21 +140,6 @@ private static function format( $string ) {
     return trim($string);
   }
 
-  /**
-   * Escapes special Markdown characters.
-   *
-   * @private
-   * @memberOf Entry
-   * @param {string} $string The string to escape.
-   * @returns {string} Returns the escaped string.
-   */
-  private function escape( $string ) {
-    $string = preg_replace('/(?<!\\\)\*/', '&#42;', $string);
-    $string = preg_replace('/(?<!\\\)\[/', '&#91;', $string);
-    $string = preg_replace('/(?<!\\\)\]/', '&#93;', $string);
-    return $string;
-  }
-
   /**
    * Modify a string by replacing named tokens with matching assoc. array values.
    *
@@ -252,6 +245,23 @@ private function addEntries( &$result, $entries ) {
     }
   }
 
+  /**
+   * Escapes special Markdown characters.
+   *
+   * @private
+   * @memberOf Entry
+   * @param {string} $string The string to escape.
+   * @returns {string} Returns the escaped string.
+   */
+  private function escape( $string ) {
+    $string = preg_replace_callback('/`.*?\`/', array($this, 'swapSnippetsToTokens'), $string);
+    $string = preg_replace('/(?<!\\\)\*/', '&#42;', $string);
+    $string = preg_replace('/(?<!\\\)\[/', '&#91;', $string);
+    $string = preg_replace('/(?<!\\\)\]/', '&#93;', $string);
+    $string = preg_replace_callback('/@@token@@/', array($this, 'swapTokensToSnippets'), $string);
+    return $string;
+  }
+
   /**
    * Resolves the entry's hash used to navigate the documentation.
    *
@@ -298,6 +308,32 @@ private function getSeparator( $entry ) {
     return $entry->isPlugin() ? '.prototype.' : '.';
   }
 
+  /**
+   * Swaps code snippets with tokens as a `preg_replace_callback` callback
+   * used by `escape`.
+   *
+   * @private
+   * @memberOf Entry
+   * @param {Array} $matches The array of regexp matches.
+   * @returns {string} Returns the token.
+   */
+  private function swapSnippetsToTokens( $matches ) {
+    $this->snippets[] = $matches[0];
+    return '@@token@@';
+  }
+
+  /**
+   * Swaps tokens with code snippets as a `preg_replace_callback` callback
+   * used by `escape`.
+   *
+   * @private
+   * @memberOf Entry
+   * @returns {string} Returns the code snippet.
+   */
+  private function swapTokensToSnippets() {
+    return array_shift($this->snippets);
+  }
+
   /*--------------------------------------------------------------------------*/
 
   /**

vendor/qunit-clib/qunit-clib.js

@@ -30,6 +30,29 @@
       return;
     }
 
+    /** Used to report the test module for failing tests */
+    var moduleName,
+        modulePrinted;
+
+    /** Used to display the wait throbber */
+    var throbberId,
+        throbberDelay = 500,
+        waitCount = -1;
+
+    /** Add `console.log()` support for Narwhal, Rhino, and RingoJS */
+    var console = context.console || (context.console = { 'log': context.print });
+
+    /** Used as a horizontal rule in console output */
+    var hr = '----------------------------------------';
+
+    /** Used by `logInline` to clear previously logged messages */
+    var prevLine = '';
+
+    /** Shorten `context.QUnit.QUnit` to `context.QUnit` */
+    var QUnit = context.QUnit = context.QUnit.QUnit || context.QUnit;
+
+    /*------------------------------------------------------------------------*/
+
     /**
      * Schedules timer-based callbacks.
      *
@@ -108,24 +131,8 @@
 
     /*------------------------------------------------------------------------*/
 
-    /** Used to report the test module for failing tests */
-    var moduleName,
-        modulePrinted;
-
-    /** Add `console.log()` support for Narwhal, Rhino, and RingoJS */
-    var console = context.console || (context.console = { 'log': context.print });
-
-    /** Used as a horizontal rule in console output */
-    var hr = '----------------------------------------';
-
-    /** Used by `logInline` to clear previously logged messages */
-    var prevLine = '';
-
-    /** Shorten `context.QUnit.QUnit` to `context.QUnit` */
-    var QUnit = context.QUnit = context.QUnit.QUnit || context.QUnit;
-
     /**
-     * Logs an inline message to standard output.
+     * Writes an inline message to standard output.
      *
      * @private
      * @param {string} text The text to log.
@@ -142,7 +149,7 @@
         process.exit();
       });
       return function(text) {
-        var blankLine = Array(prevLine.length + 1).join(' ');
+        var blankLine = repeat(' ', prevLine.length);
         if (text.length > hr.length) {
           text = text.slice(0, hr.length - 3) + '...';
         }
@@ -151,6 +158,29 @@
       }
     }());
 
+    /**
+     * Writes the wait throbber to standard output.
+     *
+     * @private
+     */
+    function logThrobber() {
+      logInline('Please wait' + repeat('.', (++waitCount % 3) + 1));
+    }
+
+    /**
+     * Creates a string with `text` repeated `n` number of times.
+     *
+     * @private
+     * @param {string} text The text to repeat.
+     * @param {number} n The number of times to repeat `text`.
+     * @returns {string} The created string.
+     */
+    function repeat(text, n) {
+      return Array(n + 1).join(text);
+    }
+
+    /*------------------------------------------------------------------------*/
+
     /**
      * A logging callback triggered when all testing is completed.
      *
@@ -224,11 +254,17 @@
      * @param {Object} details An object with property `name`.
      */
     QUnit.moduleStart(function(details) {
+      // reset the `modulePrinted` flag
       var newModuleName = details.name;
       if (moduleName != newModuleName) {
         moduleName = newModuleName;
         modulePrinted = false;
       }
+      // initialize the wait throbber
+      if (!throbberId) {
+        throbberId = context.setInterval(logThrobber, throbberDelay);
+        logThrobber();
+      }
     });
 
     /**
@@ -275,8 +311,6 @@
         assertions.forEach(function(value) {
           console.log('    ' + value);
         });
-      } else {
-        logInline('Testing ' + moduleName + '...');
       }
       assertions.length = 0;
     });