fix: revert regionRE

pull/4382/head
btea 10 months ago
parent 38239ff4c4
commit 42e844e5fc

@ -12,7 +12,7 @@ export function processIncludes(
includes: string[] includes: string[]
): string { ): string {
const includesRE = /<!--\s*@include:\s*(.*?)\s*-->/g const includesRE = /<!--\s*@include:\s*(.*?)\s*-->/g
const regionRE = /[^{#](#[\w-]+)/ const regionRE = /(#[\w-]+)/
const rangeRE = /\{(\d*),(\d*)\}$/ const rangeRE = /\{(\d*),(\d*)\}$/
const titleRE = /(\{#+\s?[\w\s]+\})/ const titleRE = /(\{#+\s?[\w\s]+\})/
@ -20,8 +20,8 @@ export function processIncludes(
if (!m1.length) return m if (!m1.length) return m
const range = m1.match(rangeRE) const range = m1.match(rangeRE)
const region = m1.match(regionRE)
const title = m1.match(titleRE) const title = m1.match(titleRE)
const region = title ? null : m1.match(regionRE)
const hasMeta = !!(region || range || title) const hasMeta = !!(region || range || title)
@ -33,6 +33,9 @@ export function processIncludes(
m1 = m1.slice(0, -len) // remove meta info from the include path m1 = m1.slice(0, -len) // remove meta info from the include path
} }
console.log('m1', m1)
console.log(region, title)
const atPresent = m1[0] === '@' const atPresent = m1[0] === '@'
try { try {
@ -63,8 +66,9 @@ export function processIncludes(
const titleName = title[0].slice(1, -1).trim() const titleName = title[0].slice(1, -1).trim()
const lines = content.split(/\r?\n/) const lines = content.split(/\r?\n/)
const start = lines.findIndex((line) => line === titleName) const start = lines.findIndex((line) => line === titleName)
const prefixLength = titleName.replace(/[^#]/g, '').length
const end = lines.findIndex( const end = lines.findIndex(
(line) => /#+\s?[\w\s]+/.test(line) && line !== titleName (line, index) => line.replace(/[^#]/g, '').length === prefixLength && index > start
) )
if (end === -1) { if (end === -1) {
content = lines.slice(start).join('\n') content = lines.slice(start).join('\n')

Loading…
Cancel
Save