From d8ae2dabda2bd9d06ba97adda284fbffdd212727 Mon Sep 17 00:00:00 2001 From: Minya Liang Date: Fri, 6 Oct 2017 12:40:47 -0500 Subject: [PATCH] docs: replace string concatenations with template literals --- tools/doc/json.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/doc/json.js b/tools/doc/json.js index 455b8252753c27..a55b94b302dc05 100644 --- a/tools/doc/json.js +++ b/tools/doc/json.js @@ -32,7 +32,7 @@ const marked = require('marked'); // customized heading without id attribute const renderer = new marked.Renderer(); renderer.heading = function(text, level) { - return '' + text + '\n'; + return `${text}\n`; }; marked.setOptions({ renderer: renderer @@ -64,8 +64,8 @@ function doJSON(input, filename, cb) { if (type === 'heading' && !text.trim().match(/^example/i)) { if (tok.depth - depth > 1) { - return cb(new Error('Inappropriate heading level\n' + - JSON.stringify(tok))); + return cb(new Error(`Inappropriate heading level +${JSON.stringify(tok)}`)); } // Sometimes we have two headings with a single @@ -245,26 +245,26 @@ function processList(section) { } } else if (type === 'list_item_end') { if (!current) { - throw new Error('invalid list - end without current item\n' + - JSON.stringify(tok) + '\n' + - JSON.stringify(list)); + throw new Error(`invalid list - end without current item +${JSON.stringify(tok)} +${JSON.stringify(list)}`); } current = stack.pop(); } else if (type === 'text') { if (!current) { - throw new Error('invalid list - text without current item\n' + - JSON.stringify(tok) + '\n' + - JSON.stringify(list)); + throw new Error(`invalid list - text without current item +${JSON.stringify(tok)} +${JSON.stringify(list)}`); } current.textRaw = current.textRaw || ''; - current.textRaw += tok.text + ' '; + current.textRaw += `${tok.text} `; } }); // shove the name in there for properties, since they are always // just going to be the value etc. if (section.type === 'property' && values[0]) { - values[0].textRaw = '`' + section.name + '` ' + values[0].textRaw; + values[0].textRaw = `\`${section.name}\` ${values[0].textRaw}`; } // now pull the actual values out of the text bits. @@ -362,8 +362,8 @@ function parseSignature(text, sig) { // at this point, the name should match. if (p !== param.name) { console.error('Warning: invalid param "%s"', p); - console.error(' > ' + JSON.stringify(param)); - console.error(' > ' + text); + console.error(` > ${JSON.stringify(param)}`); + console.error(` > ${text}`); } if (optional) param.optional = true; if (def !== undefined) param.default = def; @@ -427,9 +427,9 @@ function parseListItem(item) { function finishSection(section, parent) { if (!section || !parent) { - throw new Error('Invalid finishSection call\n' + - JSON.stringify(section) + '\n' + - JSON.stringify(parent)); + throw new Error(`Invalid finishSection call +${JSON.stringify(section)} +${JSON.stringify(parent)}`); } if (!section.type) { @@ -488,11 +488,11 @@ function finishSection(section, parent) { var plur; if (section.type.slice(-1) === 's') { - plur = section.type + 'es'; + plur = `${section.type}es`; } else if (section.type.slice(-1) === 'y') { plur = section.type.replace(/y$/, 'ies'); } else { - plur = section.type + 's'; + plur = `${section.type}s`; } // if the parent's type is 'misc', then it's just a random