Consolidate ps1 shell integration vars into __VSCodeState (microsoft#251114)

* Consolidate vscode_ps1 var into __VSCodeState

* Remove comments

Author: anthonykim1

src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1

@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------------------------
 
 # Prevent installing more than once per session
-if (Test-Path variable:global:__VSCodeOriginalPrompt) {
+if (Test-Path variable:global:__VSCodeState.OriginalPrompt) {
 	return;
 }
 
@@ -13,27 +13,33 @@ if ($ExecutionContext.SessionState.LanguageMode -ne "FullLanguage") {
 	return;
 }
 
-$Global:__VSCodeOriginalPrompt = $function:Prompt
-
-$Global:__LastHistoryId = -1
-$Global:__VSCodeIsInExecution = $false
+$Global:__VSCodeState = @{
+	OriginalPrompt = $function:Prompt
+	LastHistoryId = -1
+	IsInExecution = $false
+	EnvVarsToReport = @()
+	Nonce = $null
+	IsStable = $null
+	IsWindows10 = $false
+}
 
 # Store the nonce in script scope and unset the global
-$Nonce = $env:VSCODE_NONCE
+$Global:__VSCodeState.Nonce = $env:VSCODE_NONCE
 $env:VSCODE_NONCE = $null
 
-$isStable = $env:VSCODE_STABLE
+$Global:__VSCodeState.IsStable = $env:VSCODE_STABLE
 $env:VSCODE_STABLE = $null
 
 $__vscode_shell_env_reporting = $env:VSCODE_SHELL_ENV_REPORTING
 $env:VSCODE_SHELL_ENV_REPORTING = $null
-$Global:envVarsToReport = @()
 if ($__vscode_shell_env_reporting) {
-	$Global:envVarsToReport = $__vscode_shell_env_reporting.Split(',')
+	$Global:__VSCodeState.EnvVarsToReport = $__vscode_shell_env_reporting.Split(',')
 }
+Remove-Variable -Name __vscode_shell_env_reporting -ErrorAction SilentlyContinue
 
 $osVersion = [System.Environment]::OSVersion.Version
-$isWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
+$Global:__VSCodeState.IsWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
+Remove-Variable -Name osVersion -ErrorAction SilentlyContinue
 
 if ($env:VSCODE_ENV_REPLACE) {
 	$Split = $env:VSCODE_ENV_REPLACE.Split(":")
@@ -80,9 +86,9 @@ function Global:Prompt() {
 	$Result = ""
 	# Skip finishing the command if the first command has not yet started or an execution has not
 	# yet begun
-	if ($Global:__LastHistoryId -ne -1 -and $Global:__VSCodeIsInExecution -eq $true) {
-		$Global:__VSCodeIsInExecution = $false
-		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
+	if ($Global:__VSCodeState.LastHistoryId -ne -1 -and $Global:__VSCodeState.IsInExecution -eq $true) {
+		$Global:__VSCodeState.IsInExecution = $false
+		if ($LastHistoryEntry.Id -eq $Global:__VSCodeState.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;D`a"
 		}
@@ -101,34 +107,34 @@ function Global:Prompt() {
 
 	# Send current environment variables as JSON
 	# OSC 633 ; EnvJson ; <Environment> ; <Nonce>
-	if ($Global:envVarsToReport.Count -gt 0) {
+	if ($Global:__VSCodeState.EnvVarsToReport.Count -gt 0) {
 		$envMap = @{}
-        foreach ($varName in $envVarsToReport) {
+        foreach ($varName in $Global:__VSCodeState.EnvVarsToReport) {
             if (Test-Path "env:$varName") {
                 $envMap[$varName] = (Get-Item "env:$varName").Value
             }
         }
         $envJson = $envMap | ConvertTo-Json -Compress
-        $Result += "$([char]0x1b)]633;EnvJson;$(__VSCode-Escape-Value $envJson);$Nonce`a"
+        $Result += "$([char]0x1b)]633;EnvJson;$(__VSCode-Escape-Value $envJson);$($Global:__VSCodeState.Nonce)`a"
 	}
 
 	# Before running the original prompt, put $? back to what it was:
 	if ($FakeCode -ne 0) {
 		Write-Error "failure" -ea ignore
 	}
 	# Run the original prompt
-	$OriginalPrompt += $Global:__VSCodeOriginalPrompt.Invoke()
+	$OriginalPrompt += $Global:__VSCodeState.OriginalPrompt.Invoke()
 	$Result += $OriginalPrompt
 
 	# Prompt
 	# OSC 633 ; <Property>=<Value> ST
-	if ($isStable -eq "0") {
+	if ($Global:__VSCodeState.IsStable -eq "0") {
 		$Result += "$([char]0x1b)]633;P;Prompt=$(__VSCode-Escape-Value $OriginalPrompt)`a"
 	}
 
 	# Write command started
 	$Result += "$([char]0x1b)]633;B`a"
-	$Global:__LastHistoryId = $LastHistoryEntry.Id
+	$Global:__VSCodeState.LastHistoryId = $LastHistoryEntry.Id
 	return $Result
 }
 
@@ -148,19 +154,19 @@ elseif ((Test-Path variable:global:GitPromptSettings) -and $Global:GitPromptSett
 if (Get-Module -Name PSReadLine) {
 	[Console]::Write("$([char]0x1b)]633;P;HasRichCommandDetection=True`a")
 
-	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
+	$Global:__VSCodeState.OriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
 	function Global:PSConsoleHostReadLine {
-		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
-		$Global:__VSCodeIsInExecution = $true
+		$CommandLine = $Global:__VSCodeState.OriginalPSConsoleHostReadLine.Invoke()
+		$Global:__VSCodeState.IsInExecution = $true
 
 		# Command line
 		# OSC 633 ; E [; <CommandLine> [; <Nonce>]] ST
 		$Result = "$([char]0x1b)]633;E;"
 		$Result += $(__VSCode-Escape-Value $CommandLine)
 		# Only send the nonce if the OS is not Windows 10 as it seems to echo to the terminal
 		# sometimes
-		if ($IsWindows10 -eq $false) {
-			$Result += ";$Nonce"
+		if ($Global:__VSCodeState.IsWindows10 -eq $false) {
+			$Result += ";$($Global:__VSCodeState.Nonce)"
 		}
 		$Result += "`a"
 
@@ -175,9 +181,9 @@ if (Get-Module -Name PSReadLine) {
 	}
 
 	# Set ContinuationPrompt property
-	$ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
-	if ($ContinuationPrompt) {
-		[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $ContinuationPrompt)`a")
+	$Global:__VSCodeState.ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
+	if ($Global:__VSCodeState.ContinuationPrompt) {
+		[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $Global:__VSCodeState.ContinuationPrompt)`a")
 	}
 }