fix(compiler): Addressed infinite loop in compiler (#3992)

close #3987
This commit is contained in:
Austin Keener
2021-07-15 14:57:47 -04:00
committed by GitHub
parent 7013e8f578
commit e00aa56658
3 changed files with 90 additions and 4 deletions

View File

@@ -5,11 +5,22 @@ export function generateCodeFrame(
start = 0,
end = source.length
): string {
const lines = source.split(/\r?\n/)
// Split the content into individual lines but capture the newline sequence
// that separated each line. This is important because the actual sequence is
// needed to properly take into account the full line length for offset
// comparison
let lines = source.split(/(\r?\n)/)
// Separate the lines and newline sequences into separate arrays for easier referencing
const newlineSequences = lines.filter((_, idx) => idx % 2 === 1)
lines = lines.filter((_, idx) => idx % 2 === 0)
let count = 0
const res: string[] = []
for (let i = 0; i < lines.length; i++) {
count += lines[i].length + 1
count +=
lines[i].length +
((newlineSequences[i] && newlineSequences[i].length) || 0)
if (count >= start) {
for (let j = i - range; j <= i + range || end > count; j++) {
if (j < 0 || j >= lines.length) continue
@@ -20,9 +31,12 @@ export function generateCodeFrame(
}`
)
const lineLength = lines[j].length
const newLineSeqLength =
(newlineSequences[j] && newlineSequences[j].length) || 0
if (j === i) {
// push underline
const pad = start - (count - lineLength) + 1
const pad = start - (count - (lineLength + newLineSeqLength))
const length = Math.max(
1,
end > count ? lineLength - pad : end - start
@@ -33,7 +47,8 @@ export function generateCodeFrame(
const length = Math.max(Math.min(end - count, lineLength), 1)
res.push(` | ` + '^'.repeat(length))
}
count += lineLength + 1
count += lineLength + newLineSeqLength
}
}
break