Report 633;E before 633;C in pwsh

Author: Tyriar

src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts

@@ -97,7 +97,10 @@ const enum VSCodeOscPt {
 	/**
 	 * Explicitly set the command line. This helps workaround performance and reliability problems
 	 * with parsing out the command, such as conpty not guaranteeing the position of the sequence or
-	 * the shell not guaranteeing that the entire command is even visible.
+	 * the shell not guaranteeing that the entire command is even visible. Ideally this is called
+	 * immediately before {@link CommandExecuted}, immediately before {@link CommandFinished} will
+	 * also work but that means terminal will only know the accurate command line when the command is
+	 * finished.
 	 *
 	 * The command line can escape ascii characters using the `\xAB` format, where AB are the
 	 * hexadecimal representation of the character code (case insensitive), and escape the `\`

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1

@@ -63,29 +63,14 @@ function Global:Prompt() {
 	# error when $LastHistoryEntry is null, and is not otherwise useful.
 	Set-StrictMode -Off
 	$LastHistoryEntry = Get-History -Count 1
+	$Result = ""
 	# Skip finishing the command if the first command has not yet started
 	if ($Global:__LastHistoryId -ne -1) {
 		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
 			# Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
-			$Result = "$([char]0x1b)]633;E`a"
 			$Result += "$([char]0x1b)]633;D`a"
 		}
 		else {
-			# Command finished command line
-			# OSC 633 ; E ; <CommandLine?> ; <Nonce?> ST
-			$Result = "$([char]0x1b)]633;E;"
-			# Sanitize the command line to ensure it can get transferred to the terminal and can be parsed
-			# correctly. This isn't entirely safe but good for most cases, it's important for the Pt parameter
-			# to only be composed of _printable_ characters as per the spec.
-			if ($LastHistoryEntry.CommandLine) {
-				$CommandLine = $LastHistoryEntry.CommandLine
-			}
-			else {
-				$CommandLine = ""
-			}
-			$Result += $(__VSCode-Escape-Value $CommandLine)
-			$Result += ";$Nonce"
-			$Result += "`a"
 			# Command finished exit code
 			# OSC 633 ; D [; <ExitCode>] ST
 			$Result += "$([char]0x1b)]633;D;$FakeCode`a"
@@ -114,10 +99,24 @@ function Global:Prompt() {
 if (Get-Module -Name PSReadLine) {
 	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
 	function Global:PSConsoleHostReadLine {
-		$tmp = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
+		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
+
+		# Command line
+		# OSC 633 ; E ; <CommandLine?> ; <Nonce?> ST
+		$Result = "$([char]0x1b)]633;E;"
+		$Result += $(__VSCode-Escape-Value $CommandLine)
+		$Result += ";$Nonce"
+		$Result += "`a"
+		[Console]::Write($Result)
+
+		# Command executed
+		# OSC 633 ; C ST
+		$Result += "$([char]0x1b)]633;C`a"
+
 		# Write command executed sequence directly to Console to avoid the new line from Write-Host
-		[Console]::Write("$([char]0x1b)]633;C`a")
-		$tmp
+		[Console]::Write($Result)
+
+		$CommandLine
 	}
 }
 

src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts

@@ -22,6 +22,7 @@ declare module 'vscode' {
 		 *   fired.
 		 * - It may be inaccurate initially if the command line is pulled from the buffer directly
 		 *   via the [`OSC 633/133 ; A`, `B` and `C` sequences](https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st).
+		 * - It may contain line continuation characters and/or parts of the right prompt.
 		 * - It may be inaccurate if the shell integration does not support command line reporting
 		 *   via the [`OSC 633 ; E` sequence](https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st).
 		 */