Skip to content

Commit

Permalink
tools: replace concat with template literals
Browse files Browse the repository at this point in the history
PR-URL: #16046
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Lance Ball <lball@redhat.com>
  • Loading branch information
Minya Liang authored and MylesBorins committed Oct 11, 2017
1 parent 5d63c10 commit 0e707f3
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions tools/doc/json.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const marked = require('marked');
// customized heading without id attribute
const renderer = new marked.Renderer();
renderer.heading = function(text, level) {
return '<h' + level + '>' + text + '</h' + level + '>\n';
return `<h${level}>${text}</h${level}>\n`;
};
marked.setOptions({
renderer: renderer
Expand Down Expand Up @@ -246,25 +246,25 @@ 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(tok)}\n` +
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(tok)}\n` +
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.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -428,7 +428,7 @@ function parseListItem(item) {
function finishSection(section, parent) {
if (!section || !parent) {
throw new Error('Invalid finishSection call\n' +
JSON.stringify(section) + '\n' +
`${JSON.stringify(section)}\n` +
JSON.stringify(parent));
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0e707f3

Please sign in to comment.