From 2307e53d0e6823aa422bfb9d2357f121e06e3472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 24 Jul 2013 10:50:57 -0700 Subject: [PATCH] Fix docblock parsing to handle `\r\n` --- vendor/fbtransform/lib/docblock.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/fbtransform/lib/docblock.js b/vendor/fbtransform/lib/docblock.js index 9c28a1b2ff5..3df8eae5248 100644 --- a/vendor/fbtransform/lib/docblock.js +++ b/vendor/fbtransform/lib/docblock.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var docblockRe = /^\s*(\/\*\*(.|\n)*?\*\/)/; +var docblockRe = /^\s*(\/\*\*(.|\r?\n)*?\*\/)/; var ltrimRe = /^\s*/; /** * @param {String} contents @@ -32,9 +32,9 @@ function extract(contents) { var commentStartRe = /^\/\*\*?/; var commentEndRe = /\*\/$/; var wsRe = /[\t ]+/g; -var stringStartRe = /(\n|^) *\*/g; -var multilineRe = /(?:^|\n) *(@[^\n]*?) *\n *([^@\n\s][^@\n]+?) *\n/g; -var propertyRe = /(?:^|\n) *@(\S+) *([^\n]*)/g; +var stringStartRe = /(\r?\n|^) *\*/g; +var multilineRe = /(?:^|\r?\n) *(@[^\r\n]*?) *\r?\n *([^@\r\n\s][^@\r\n]+?) *\r?\n/g; +var propertyRe = /(?:^|\r?\n) *@(\S+) *([^\r\n]*)/g; /** * @param {String} contents