Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions packages/vite/src/node/__tests__/utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
isFileReadable,
mergeWithDefaults,
normalizePath,
numberToPos,
posToNumber,
processSrcSetSync,
resolveHostname,
Expand Down Expand Up @@ -245,6 +246,34 @@ describe('posToNumber', () => {
})
})

describe('numberToPos', () => {
test('simple', () => {
const actual = numberToPos('a\nb', 2)
expect(actual).toEqual({ line: 2, column: 0 })
})
test('pass though pos', () => {
const actual = numberToPos('a\nb', { line: 2, column: 0 })
expect(actual).toEqual({ line: 2, column: 0 })
})
test('empty line', () => {
const actual = numberToPos('a\n\nb', 3)
expect(actual).toEqual({ line: 3, column: 0 })
})
test('middle of line', () => {
const actual = numberToPos('abc\ndef', 5)
expect(actual).toEqual({ line: 2, column: 1 })
})
test('end of line', () => {
const actual = numberToPos('abc\ndef', 3)
expect(actual).toEqual({ line: 1, column: 3 })
})
test('out of range', () => {
expect(() => numberToPos('a\nb', 5)).toThrowError(
'offset is longer than source length',
)
})
})

describe('generateCodeFrames', () => {
const source = `
import foo from './foo'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ exports[`parse error 2`] = `
2 | ",
"id": "/fixtures/errors/syntax-error.js",
"loc": {
"column": 9,
"column": 8,
"file": "/fixtures/errors/syntax-error.js",
"line": 1,
},
"message": "Parse failure: Expected ';', '}' or <eof>
At file: /fixtures/errors/syntax-error.js:1:9",
At file: /fixtures/errors/syntax-error.js:1:8",
}
`;

Expand Down Expand Up @@ -61,11 +61,11 @@ exports[`parse error 4`] = `
2 | ",
"id": "/fixtures/errors/syntax-error.js",
"loc": {
"column": 9,
"column": 8,
"file": "/fixtures/errors/syntax-error.js",
"line": 1,
},
"message": "Parse failure: Expected ';', '}' or <eof>
At file: /fixtures/errors/syntax-error.js:1:9",
At file: /fixtures/errors/syntax-error.js:1:8",
}
`;
17 changes: 5 additions & 12 deletions packages/vite/src/node/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -493,19 +493,12 @@ export function numberToPos(source: string, offset: number | Pos): Pos {
`offset is longer than source length! offset ${offset} > length ${source.length}`,
)
}
const lines = source.split(splitRE)
let counted = 0
let line = 0
let column = 0
for (; line < lines.length; line++) {
const lineLength = lines[line].length + 1
if (counted + lineLength >= offset) {
column = offset - counted + 1
break
}
counted += lineLength

const lines = source.slice(0, offset).split(splitRE)
return {
line: lines.length,
column: lines[lines.length - 1].length,
}
return { line: line + 1, column }
}

export function generateCodeFrame(
Expand Down