diff --git a/README.md b/README.md
index beb80c6..2d0bd65 100644
--- a/README.md
+++ b/README.md
@@ -185,13 +185,11 @@ const md = markdownit({
highlight: function (str, lang) {
if (lang && hljs.getLanguage(lang)) {
try {
- return '' +
- hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
- '
';
+ return `${hljs.highlight(str, { language: lang, ignoreIllegals: true }).value}
`;
} catch (__) {}
}
- return '' + md.utils.escapeHtml(str) + '
';
+ return `${md.utils.escapeHtml(str)}
`;
}
});
```
diff --git a/bin/markdown-it.mjs b/bin/markdown-it.mjs
index a32f120..5981048 100755
--- a/bin/markdown-it.mjs
+++ b/bin/markdown-it.mjs
@@ -68,7 +68,7 @@ readFile(options.file, 'utf8', function (err, input) {
if (err) {
if (err.code === 'ENOENT') {
- console.error('File not found: ' + options.file)
+ console.error(`File not found: ${options.file}`)
process.exit(2)
}
diff --git a/docs/architecture.md b/docs/architecture.md
index 5be8c61..8eda291 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -121,9 +121,7 @@ md.renderer.rules.image = function (tokens, idx, options, env, self) {
if (vimeoRE.test(src)) {
var id = src.match(vimeoRE)[2];
- return '\n' +
- ' \n' +
- '
\n';
+ return `\n \n
\n`;
}
// Pass the token to the default renderer.
diff --git a/src/common/html_re.ts b/src/common/html_re.ts
index 90071d8..5c999d2 100644
--- a/src/common/html_re.ts
+++ b/src/common/html_re.ts
@@ -6,11 +6,11 @@ const unquoted = '[^"\'=<>`\\x00-\\x20]+'
const single_quoted = "'[^']*'"
const double_quoted = '"[^"]*"'
-const attr_value = '(?:' + unquoted + '|' + single_quoted + '|' + double_quoted + ')'
+const attr_value = `(?:${unquoted}|${single_quoted}|${double_quoted})`
-const attribute = '(?:\\s+' + attr_name + '(?:\\s*=\\s*' + attr_value + ')?)'
+const attribute = `(?:\\s+${attr_name}(?:\\s*=\\s*${attr_value})?)`
-const open_tag = '<[A-Za-z][A-Za-z0-9\\-]*' + attribute + '*\\s*\\/?>'
+const open_tag = `<[A-Za-z][A-Za-z0-9\\-]*${attribute}*\\s*\\/?>`
const close_tag = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>'
const comment = ''
@@ -18,8 +18,9 @@ const processing = '<[?][\\s\\S]*?[?]>'
const declaration = ']*>'
const cdata = ''
-const HTML_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + '|' + comment +
- '|' + processing + '|' + declaration + '|' + cdata + ')')
-const HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + ')')
+const HTML_TAG_RE = new RegExp(
+ `^(?:${open_tag}|${close_tag}|${comment}|${processing}|${declaration}|${cdata})`
+)
+const HTML_OPEN_CLOSE_TAG_RE = new RegExp(`^(?:${open_tag}|${close_tag})`)
export { HTML_TAG_RE, HTML_OPEN_CLOSE_TAG_RE }
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 74af537..e2477ca 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -63,7 +63,7 @@ function fromCodePoint (c: number) {
const UNESCAPE_MD_RE = /\\([!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~])/g
const ENTITY_RE = /&([a-z#][a-z0-9]{1,31});/gi
-const UNESCAPE_ALL_RE = new RegExp(UNESCAPE_MD_RE.source + '|' + ENTITY_RE.source, 'gi')
+const UNESCAPE_ALL_RE = new RegExp(`${UNESCAPE_MD_RE.source}|${ENTITY_RE.source}`, 'gi')
const DIGITAL_ENTITY_TEST_RE = /^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))$/i
diff --git a/src/markdownit.ts b/src/markdownit.ts
index c212d53..ff2bc21 100644
--- a/src/markdownit.ts
+++ b/src/markdownit.ts
@@ -228,13 +228,11 @@ function normalizeLinkText (url: string): string {
* highlight: function (str, lang) {
* if (lang && hljs.getLanguage(lang)) {
* try {
- * return '' +
- * hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
- * '
';
+ * return `${hljs.highlight(str, { language: lang, ignoreIllegals: true }).value}
`;
* } catch (__) {}
* }
*
- * return '' + md.utils.escapeHtml(str) + '
';
+ * return `${md.utils.escapeHtml(str)}
`;
* }
* });
* ```
@@ -468,7 +466,7 @@ class MarkdownIt {
const missed = list.filter((name) => result.indexOf(name) < 0)
if (missed.length && !ignoreInvalid) {
- throw new Error('MarkdownIt. Failed to enable unknown rule(s): ' + missed)
+ throw new Error(`MarkdownIt. Failed to enable unknown rule(s): ${missed}`)
}
return this
@@ -496,7 +494,7 @@ class MarkdownIt {
const missed = list.filter((name) => result.indexOf(name) < 0)
if (missed.length && !ignoreInvalid) {
- throw new Error('MarkdownIt. Failed to disable unknown rule(s): ' + missed)
+ throw new Error(`MarkdownIt. Failed to disable unknown rule(s): ${missed}`)
}
return this
}
diff --git a/src/renderer.ts b/src/renderer.ts
index b3914e5..82f6f1b 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -29,9 +29,7 @@ default_rules.code_inline = function (
): string {
const token = tokens[idx]
- return '' +
- escapeHtml(token.content) +
- ''
+ return `${escapeHtml(token.content)}`
}
default_rules.code_block = function (
@@ -43,9 +41,7 @@ default_rules.code_block = function (
): string {
const token = tokens[idx]
- return '' +
- escapeHtml(tokens[idx].content) +
- '\n'
+ return `${escapeHtml(tokens[idx].content)}\n`
}
default_rules.fence = function (
@@ -85,10 +81,10 @@ default_rules.fence = function (
const tmpAttrs = token.attrs ? token.attrs.slice() : []
if (i < 0) {
- tmpAttrs.push(['class', options.langPrefix + langName])
+ tmpAttrs.push(['class', `${options.langPrefix}${langName}`])
} else {
tmpAttrs[i] = [tmpAttrs[i][0], tmpAttrs[i][1]] // shallow clone
- tmpAttrs[i][1] += ' ' + options.langPrefix + langName
+ tmpAttrs[i][1] += ` ${options.langPrefix}${langName}`
}
// Fake token just to render attributes
@@ -197,7 +193,7 @@ class Renderer {
result = ''
for (i = 0, l = token.attrs.length; i < l; i++) {
- result += ' ' + escapeHtml(token.attrs[i][0]) + '="' + escapeHtml(String(token.attrs[i][1])) + '"'
+ result += ` ${escapeHtml(token.attrs[i][0])}="${escapeHtml(String(token.attrs[i][1]))}"`
}
return result
diff --git a/src/ruler.ts b/src/ruler.ts
index bf48bec..8a966ee 100644
--- a/src/ruler.ts
+++ b/src/ruler.ts
@@ -119,7 +119,7 @@ class Ruler {
at (name: string, fn: (...args: Args) => Result, options: RuleOptions = {}): void {
const index = this.__find__(name)
- if (index === -1) { throw new Error('Parser rule not found: ' + name) }
+ if (index === -1) { throw new Error(`Parser rule not found: ${name}`) }
this.__rules__[index].fn = fn
this.__rules__[index].alt = options.alt || []
@@ -153,7 +153,7 @@ class Ruler {
before (beforeName: string, ruleName: string, fn: (...args: Args) => Result, options: RuleOptions = {}): void {
const index = this.__find__(beforeName)
- if (index === -1) { throw new Error('Parser rule not found: ' + beforeName) }
+ if (index === -1) { throw new Error(`Parser rule not found: ${beforeName}`) }
this.__rules__.splice(index, 0, {
name: ruleName,
@@ -192,7 +192,7 @@ class Ruler {
after (afterName: string, ruleName: string, fn: (...args: Args) => Result, options: RuleOptions = {}): void {
const index = this.__find__(afterName)
- if (index === -1) { throw new Error('Parser rule not found: ' + afterName) }
+ if (index === -1) { throw new Error(`Parser rule not found: ${afterName}`) }
this.__rules__.splice(index + 1, 0, {
name: ruleName,
@@ -261,7 +261,7 @@ class Ruler {
if (idx < 0) {
if (ignoreInvalid) { return }
- throw new Error('Rules manager: invalid rule name ' + name)
+ throw new Error(`Rules manager: invalid rule name ${name}`)
}
this.__rules__[idx].enabled = true
result.push(name)
@@ -312,7 +312,7 @@ class Ruler {
if (idx < 0) {
if (ignoreInvalid) { return }
- throw new Error('Rules manager: invalid rule name ' + name)
+ throw new Error(`Rules manager: invalid rule name ${name}`)
}
this.__rules__[idx].enabled = false
result.push(name)
diff --git a/src/rules_block/heading.ts b/src/rules_block/heading.ts
index b777072..ac178ca 100644
--- a/src/rules_block/heading.ts
+++ b/src/rules_block/heading.ts
@@ -36,7 +36,7 @@ export default function heading (state: StateBlock, startLine: number, endLine:
state.line = startLine + 1
- const token_o = state.push('heading_open', 'h' + String(level), 1)
+ const token_o = state.push('heading_open', `h${level}`, 1)
token_o.markup = '########'.slice(0, level)
token_o.map = [startLine, state.line]
@@ -45,7 +45,7 @@ export default function heading (state: StateBlock, startLine: number, endLine:
token_i.map = [startLine, state.line]
token_i.children = []
- const token_c = state.push('heading_close', 'h' + String(level), -1)
+ const token_c = state.push('heading_close', `h${level}`, -1)
token_c.markup = '########'.slice(0, level)
return true
diff --git a/src/rules_block/html_block.ts b/src/rules_block/html_block.ts
index 5d51099..7d57531 100644
--- a/src/rules_block/html_block.ts
+++ b/src/rules_block/html_block.ts
@@ -17,8 +17,8 @@ const HTML_SEQUENCES: Array<[
[/^<\?/, /\?>/, true],
[/^/, true],
[/^/, true],
- [new RegExp('^|$))', 'i'), /^$/, true],
- [new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'), /^$/, false]
+ [new RegExp(`^|$))`, 'i'), /^$/, true],
+ [new RegExp(`${HTML_OPEN_CLOSE_TAG_RE.source}\\s*$`), /^$/, false]
]
export default function html_block (state: StateBlock, startLine: number, endLine: number, silent: boolean): boolean {
diff --git a/src/rules_block/lheading.ts b/src/rules_block/lheading.ts
index 145133e..6d77dfa 100644
--- a/src/rules_block/lheading.ts
+++ b/src/rules_block/lheading.ts
@@ -68,7 +68,7 @@ export default function lheading (state: StateBlock, startLine: number, endLine:
state.line = nextLine + 1
- const token_o = state.push('heading_open', 'h' + String(level), 1)
+ const token_o = state.push('heading_open', `h${level}`, 1)
token_o.markup = String.fromCharCode(marker!)
token_o.map = [startLine, state.line]
@@ -77,7 +77,7 @@ export default function lheading (state: StateBlock, startLine: number, endLine:
token_i.map = [startLine, state.line - 1]
token_i.children = []
- const token_c = state.push('heading_close', 'h' + String(level), -1)
+ const token_c = state.push('heading_close', `h${level}`, -1)
token_c.markup = String.fromCharCode(marker!)
state.parentType = oldParentType
diff --git a/src/rules_block/table.ts b/src/rules_block/table.ts
index 3d30f8d..8fb786c 100644
--- a/src/rules_block/table.ts
+++ b/src/rules_block/table.ts
@@ -152,7 +152,7 @@ export default function table (state: StateBlock, startLine: number, endLine: nu
for (let i = 0; i < columns.length; i++) {
const token_ho = state.push('th_open', 'th', 1)
if (aligns[i]) {
- token_ho.attrs = [['style', 'text-align:' + aligns[i]]]
+ token_ho.attrs = [['style', `text-align:${aligns[i]}`]]
}
const token_il = state.push('inline', '', 0)
@@ -203,7 +203,7 @@ export default function table (state: StateBlock, startLine: number, endLine: nu
for (let i = 0; i < columnCount; i++) {
const token_tdo = state.push('td_open', 'td', 1)
if (aligns[i]) {
- token_tdo.attrs = [['style', 'text-align:' + aligns[i]]]
+ token_tdo.attrs = [['style', `text-align:${aligns[i]}`]]
}
const token_il = state.push('inline', '', 0)
diff --git a/src/rules_core/linkify.ts b/src/rules_core/linkify.ts
index 99949fa..8746fc5 100644
--- a/src/rules_core/linkify.ts
+++ b/src/rules_core/linkify.ts
@@ -84,9 +84,9 @@ export default function linkify (state: StateCore): void {
// and remove it afterwards.
//
if (!links[ln].schema) {
- urlText = state.md.normalizeLinkText('http://' + urlText).replace(/^http:\/\//, '')
+ urlText = state.md.normalizeLinkText(`http://${urlText}`).replace(/^http:\/\//, '')
} else if (links[ln].schema === 'mailto:' && !/^mailto:/i.test(urlText)) {
- urlText = state.md.normalizeLinkText('mailto:' + urlText).replace(/^mailto:/, '')
+ urlText = state.md.normalizeLinkText(`mailto:${urlText}`).replace(/^mailto:/, '')
} else {
urlText = state.md.normalizeLinkText(urlText)
}
diff --git a/src/rules_inline/autolink.ts b/src/rules_inline/autolink.ts
index 0d227f0..9ce472e 100644
--- a/src/rules_inline/autolink.ts
+++ b/src/rules_inline/autolink.ts
@@ -49,7 +49,7 @@ export default function autolink (state: StateInline, silent: boolean): boolean
}
if (EMAIL_RE.test(url)) {
- const fullUrl = state.md.normalizeLink('mailto:' + url)
+ const fullUrl = state.md.normalizeLink(`mailto:${url}`)
if (!state.md.validateLink(fullUrl)) { return false }
if (!silent) {
diff --git a/src/token.ts b/src/token.ts
index 5f84a22..84d6453 100644
--- a/src/token.ts
+++ b/src/token.ts
@@ -197,7 +197,7 @@ class Token {
if (idx < 0) {
this.attrPush([name, value])
} else {
- this.attrs![idx][1] = this.attrs![idx][1] + ' ' + value
+ this.attrs![idx][1] = `${this.attrs![idx][1]} ${value}`
}
}
}
diff --git a/support/demo_template/index.mjs b/support/demo_template/index.mjs
index 0c39c11..4e629f0 100644
--- a/support/demo_template/index.mjs
+++ b/support/demo_template/index.mjs
@@ -126,28 +126,24 @@ defaults.highlight = function (str, lang) {
}
if (lang && lang !== 'auto' && hljs.getLanguage(lang)) {
- return '' +
- hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
- '
'
+ return `${hljs.highlight(str, { language: lang, ignoreIllegals: true }).value}
`
} else if (lang === 'auto') {
const result = hljs.highlightAuto(str)
- console.log('highlight language: ' + result.language + ', relevance: ' + result.relevance)
+ console.log(`highlight language: ${result.language}, relevance: ${result.relevance}`)
- return '' +
- result.value +
- '
'
+ return `${result.value}
`
}
} catch (__) { /**/ }
- return '' + esc(str) + '
'
+ return `${esc(str)}
`
}
function setOptionClass (name, val) {
if (val) {
- document.body.classList.add('opt_' + name)
+ document.body.classList.add(`opt_${name}`)
} else {
- document.body.classList.remove('opt_' + name)
+ document.body.classList.remove(`opt_${name}`)
}
}
@@ -155,7 +151,7 @@ function setResultView (val) {
document.body.classList.remove('result-as-html')
document.body.classList.remove('result-as-src')
document.body.classList.remove('result-as-debug')
- document.body.classList.add('result-as-' + val)
+ document.body.classList.add(`result-as-${val}`)
defaults._view = val
}
@@ -227,10 +223,10 @@ function updateResult () {
try {
if (source) {
// serialize state - source and options
- permalink.href = '#md3=' + mdurl.encode(JSON.stringify({
+ permalink.href = `#md3=${mdurl.encode(JSON.stringify({
source,
defaults: permalinkDefaults()
- }), '-_.!~', false)
+ }), '-_.!~', false)}`
} else {
permalink.href = ''
}
@@ -252,7 +248,7 @@ function buildScrollMap () {
position: 'absolute',
visibility: 'hidden',
height: 'auto',
- width: textarea.clientWidth + 'px',
+ width: `${textarea.clientWidth}px`,
fontSize: textareaStyle.fontSize,
fontFamily: textareaStyle.fontFamily,
lineHeight: textareaStyle.lineHeight,
diff --git a/support/specsplit.mjs b/support/specsplit.mjs
index cfaf7b0..0505f1e 100755
--- a/support/specsplit.mjs
+++ b/support/specsplit.mjs
@@ -59,7 +59,7 @@ readFile(options.spec, 'utf8', function (error, input) {
if (error) {
if (error.code === 'ENOENT') {
- process.stderr.write('File not found: ' + options.spec)
+ process.stderr.write(`File not found: ${options.spec}`)
process.exit(2)
}
@@ -102,10 +102,7 @@ readFile(options.spec, 'utf8', function (error, input) {
const data = options.type === 'good' ? good : bad
data.forEach(function (sample) {
- out.push(
- '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n' +
- `src line: ${sample.line}\n\n.\n${sample.md}.\n${sample.html}.\n`
- )
+ out.push(`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\nsrc line: ${sample.line}\n\n.\n${sample.md}.\n${sample.html}.\n`)
if (sample.err) {
out.push(`error:\n\n${sample.err}\n`)
}
diff --git a/test/cmspec/commonmark.test.mjs b/test/cmspec/commonmark.test.mjs
index 7c7632e..69389fb 100644
--- a/test/cmspec/commonmark.test.mjs
+++ b/test/cmspec/commonmark.test.mjs
@@ -31,7 +31,7 @@ function loadSpecExamples (path, md) {
function generate (path, md) {
describe('spec.txt', function () {
loadSpecExamples(path, md).forEach(function (fixture) {
- it('line ' + fixture.line, function () {
+ it(`line ${fixture.line}`, function () {
assert.strictEqual(md.render(fixture.md), normalize(fixture.html))
})
})
diff --git a/test/markdown-it/misc.test.mjs b/test/markdown-it/misc.test.mjs
index 13e070b..a771baf 100644
--- a/test/markdown-it/misc.test.mjs
+++ b/test/markdown-it/misc.test.mjs
@@ -42,7 +42,7 @@ describe('API', function () {
it('highlight', function () {
const md = markdownit({
highlight: function (str) {
- return '==' + str + '==
'
+ return `==${str}==
`
}
})
@@ -64,7 +64,7 @@ describe('API', function () {
highlight: function (str, lang, attrs) {
assert.strictEqual(lang, 'a')
assert.strictEqual(attrs, 'b c d')
- return '==' + str + '==
'
+ return `==${str}==
`
}
})