Fix the PowerShell integration script microsoft#165022 (microsoft#165023)

* Don't set LastExitCode

That's a magic variable in PowerShell

* Force $? before running original prompt

* Fix indentation

Co-authored-by: Megan Rogge <[email protected]>
Co-authored-by: Daniel Imms <[email protected]>

Author: 3 people

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

@@ -17,17 +17,10 @@ $Global:__VSCodeOriginalPrompt = $function:Prompt
 
 $Global:__LastHistoryId = -1
 
-function Global:__VSCode-Get-LastExitCode {
-	if ($? -eq $True) {
-		return 0
-	}
-	# TODO: Should we just return a string instead?
-	return -1
-}
 
 function Global:Prompt() {
-	$LastExitCode = $(__VSCode-Get-LastExitCode);
-	$LastHistoryEntry = $(Get-History -Count 1)
+	$FakeCode = [int]!$global:?
+	$LastHistoryEntry = Get-History -Count 1
 	# Skip finishing the command if the first command has not yet started
 	if ($Global:__LastHistoryId -ne -1) {
 		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
@@ -50,7 +43,7 @@ function Global:Prompt() {
 			$Result += "`a"
 			# Command finished exit code
 			# OSC 633 ; D [; <ExitCode>] ST
-			$Result += "`e]633;D;$LastExitCode`a"
+			$Result += "`e]633;D;$FakeCode`a"
 		}
 	}
 	# Prompt started
@@ -59,7 +52,9 @@ function Global:Prompt() {
 	# Current working directory
 	# OSC 633 ; <Property>=<Value> ST
 	$Result += if($pwd.Provider.Name -eq 'FileSystem'){"`e]633;P;Cwd=$($pwd.ProviderPath)`a"}
-	# Write original prompt
+	# Before running the original prompt, put $? back to what it was:
+	if ($FakeCode -ne 0) { Write-Error "failure" -ea ignore }
+	# Run the original prompt
 	$Result += $Global:__VSCodeOriginalPrompt.Invoke()
 	# Write command started
 	$Result += "`e]633;B`a"