fix: restore cli cursor on unexpected exits

AriPerkkio · AriPerkkio · commit 0592f39999fe · 2024-11-18T13:48:09.000+02:00
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -162,6 +162,7 @@
     "expect-type": "^1.1.0",
     "magic-string": "^0.30.12",
     "pathe": "^1.1.2",
+    "restore-cursor": "^5.1.0",
     "std-env": "^3.8.0",
     "tinybench": "^2.9.0",
     "tinyexec": "^0.3.1",
diff --git a/packages/vitest/src/node/reporters/renderers/windowedRenderer.ts b/packages/vitest/src/node/reporters/renderers/windowedRenderer.ts
@@ -1,6 +1,7 @@
 import type { Writable } from 'node:stream'
 import type { Vitest } from '../../core'
 import { stripVTControlCharacters } from 'node:util'
+import restoreCursor from 'restore-cursor'
 
 const DEFAULT_RENDER_INTERVAL = 16
 
@@ -50,6 +51,9 @@ export class WindowRenderer {
       this.interceptStream(process.stderr, 'error'),
     )
 
+    restoreCursor()
+    this.write(HIDE_CURSOR, 'output')
+
     this.start()
   }
 
@@ -129,7 +133,6 @@ export class WindowRenderer {
 
     this.write(windowContent.join('\n'))
     this.write(SYNC_END)
-    this.write(HIDE_CURSOR)
 
     this.windowHeight = rowCount + Math.max(0, padding)
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import type { Writable } from 'node:stream'`
`2`	`2`	`import type { Vitest } from '../../core'`
`3`	`3`	`import { stripVTControlCharacters } from 'node:util'`
	`4`	`+import restoreCursor from 'restore-cursor'`
`4`	`5`
`5`	`6`	`const DEFAULT_RENDER_INTERVAL = 16`
`6`	`7`
`@@ -50,6 +51,9 @@ export class WindowRenderer {`
`50`	`51`	`this.interceptStream(process.stderr, 'error'),`
`51`	`52`	`)`
`52`	`53`
	`54`	`+ restoreCursor()`
	`55`	`+ this.write(HIDE_CURSOR, 'output')`
	`56`	`+`
`53`	`57`	`this.start()`
`54`	`58`	`}`
`55`	`59`
`@@ -129,7 +133,6 @@ export class WindowRenderer {`
`129`	`133`
`130`	`134`	`this.write(windowContent.join('\n'))`
`131`	`135`	`this.write(SYNC_END)`
`132`		`- this.write(HIDE_CURSOR)`
`133`	`136`
`134`	`137`	`this.windowHeight = rowCount + Math.max(0, padding)`
`135`	`138`	`}`