fix: generateCodeFrame infinite loop

vitejs · Nov 22, 2023 · 1fa00e7 · 1fa00e7
1 parent bcc4a61
commit 1fa00e7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/packages/vite/src/node/__tests__/__snapshots__/utils.spec.ts.snap b/packages/vite/src/node/__tests__/__snapshots__/utils.spec.ts.snap
@@ -25,6 +25,24 @@ exports[`generateCodeFrames > end 3`] = `
 "
 `;
 
+exports[`generateCodeFrames > end 4`] = `
+"
+1  |  import foo from './foo'
+   |  ^^^^^^^^^^^^^^^^^^^^^^^
+2  |  foo()
+   |  ^^^^^
+"
+`;
+
+exports[`generateCodeFrames > end 5`] = `
+"
+1  |  import foo from './foo'
+   |  ^^^^^^^^^^^^^^^^^^^^^^^
+2  |  foo()
+   |  ^^^^^
+"
+`;
+
 exports[`generateCodeFrames > range 1`] = `
 "
 1  |  
@@ -47,13 +65,21 @@ exports[`generateCodeFrames > start with number 1`] = `
 exports[`generateCodeFrames > start with number 2`] = `
 "
 1  |  import foo from './foo'
-   |   ^
+   |  ^
 2  |  foo()
 "
 `;
 
 exports[`generateCodeFrames > start with number 3`] = `
 "
+1  |  import foo from './foo'
+   |   ^
+2  |  foo()
+"
+`;
+
+exports[`generateCodeFrames > start with number 4`] = `
+"
 1  |  import foo from './foo'
 2  |  foo()
    |  ^

diff --git a/packages/vite/src/node/__tests__/utils.spec.ts b/packages/vite/src/node/__tests__/utils.spec.ts
@@ -204,6 +204,7 @@ foo()
   }
 
   test('start with number', () => {
+    expectSnapshot(generateCodeFrame(source, -1))
     expectSnapshot(generateCodeFrame(source, 0))
     expectSnapshot(generateCodeFrame(source, 1))
     expectSnapshot(generateCodeFrame(source, 24))
@@ -223,6 +224,8 @@ foo()
     expectSnapshot(generateCodeFrame(source, 0, 0))
     expectSnapshot(generateCodeFrame(source, 0, 23))
     expectSnapshot(generateCodeFrame(source, 0, 29))
+    expectSnapshot(generateCodeFrame(source, 0, source.length))
+    expectSnapshot(generateCodeFrame(source, 0, source.length + 1))
   })
 
   test('range', () => {

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -530,6 +530,7 @@ export function generateCodeFrame(
             end > count ? lineLength - pad : end - start,
           )
           res.push(`   |  ` + ' '.repeat(pad) + '^'.repeat(length))
+          count++
         } else if (j > i) {
           if (end > count) {
             const length = Math.max(Math.min(end - count, lineLength), 1)