From 3d7745d6fc893500e379c6780d8a8e5687d885df Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Thu, 23 Apr 2020 07:29:47 -0700
Subject: [PATCH] Dispose data listener before disposing terminal

Fixes #95945
---
 .../src/singlefolder-tests/terminal.test.ts                 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
index 0761145923f..b78235a8226 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -45,7 +45,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
 					return;
 				}
 				let data = '';
-				disposables.push(window.onDidWriteTerminalData(e => {
+				const dataDisposable = window.onDidWriteTerminalData(e => {
 					try {
 						equal(terminal, e.terminal);
 					} catch (e) {
@@ -54,10 +54,12 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
 					}
 					data += e.data;
 					if (data.indexOf(expected) !== 0) {
+						dataDisposable.dispose();
 						terminal.dispose();
 						disposables.push(window.onDidCloseTerminal(() => done()));
 					}
-				}));
+				});
+				disposables.push(dataDisposable);
 			}));
 			// Use a single character to avoid winpty/conpty issues with injected sequences
 			const expected = '`';
-- 
GitLab