From 6400a0cf681876f03e1ca82b99aa46d44b4d7d78 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Thu, 12 Sep 2019 19:07:48 -0700
Subject: [PATCH] Use onDidWriteTerminalData

Part of microsoft/vscode#78574
---
 terminal-sample/package.json     |  4 ++--
 terminal-sample/src/extension.ts | 19 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/terminal-sample/package.json b/terminal-sample/package.json
index 06085752..3995f4ad 100644
--- a/terminal-sample/package.json
+++ b/terminal-sample/package.json
@@ -20,7 +20,7 @@
 		"onCommand:terminalTest.dispose",
 		"onCommand:terminalTest.hide",
 		"onCommand:terminalTest.onDidChangeTerminalDimensions",
-		"onCommand:terminalTest.onDidWriteData",
+		"onCommand:terminalTest.onDidWriteTerminalData",
 		"onCommand:terminalTest.processId",
 		"onCommand:terminalTest.sendText",
 		"onCommand:terminalTest.sendTextNoNewLine",
@@ -60,7 +60,7 @@
 				"title": "Terminal API: Hide"
 			},
 			{
-				"command": "terminalTest.onDidWriteData",
+				"command": "terminalTest.onDidWriteTerminalData",
 				"title": "Terminal API: Attach data listener"
 			},
 			{
diff --git a/terminal-sample/src/extension.ts b/terminal-sample/src/extension.ts
index 287c64a1..d84674ed 100644
--- a/terminal-sample/src/extension.ts
+++ b/terminal-sample/src/extension.ts
@@ -12,10 +12,6 @@ export function activate(context: vscode.ExtensionContext) {
 	// vscode.window.onDidOpenTerminal
 	vscode.window.onDidOpenTerminal(terminal => {
 		console.log("Terminal opened. Total count: " + (<any>vscode.window).terminals.length);
-
-		(<any>terminal).onDidWriteData((data: any) => {
-			console.log("Terminal data: ", data);
-		});
 	});
 	vscode.window.onDidOpenTerminal((terminal: vscode.Terminal) => {
 		vscode.window.showInformationMessage(`onDidOpenTerminal, name: ${terminal.name}`);
@@ -135,16 +131,11 @@ export function activate(context: vscode.ExtensionContext) {
 
 	// vvv Proposed APIs below vvv
 
-	// vscode.window.onDidWriteData
-	context.subscriptions.push(vscode.commands.registerCommand('terminalTest.onDidWriteData', () => {
-		selectTerminal().then(terminal => {
-			if (!terminal) {
-				return;
-			}
-			vscode.window.showInformationMessage(`onDidWriteData listener attached for terminal: ${terminal.name}, check the devtools console to see events`);
-			(<any>terminal).onDidWriteData((data: string) => {
-				console.log('onDidWriteData: ' + data);
-			});
+	// vscode.window.onDidWriteTerminalData
+	context.subscriptions.push(vscode.commands.registerCommand('terminalTest.onDidWriteTerminalData', () => {
+		(<any>vscode.window).onDidWriteTerminalData((e: any) => {
+			vscode.window.showInformationMessage(`onDidWriteTerminalData listener attached, check the devtools console to see events`);
+			console.log('onDidWriteData', e);
 		});
 	}));