44# ---------------------------------------------------------------------------------------------
55
66# Prevent installing more than once per session
7- if (Test-Path variable:global :__VSCodeState.OriginalPrompt) {
7+ if (Test-Path variable:Script :__VSCodeState.OriginalPrompt) {
88 return ;
99}
1010
@@ -13,7 +13,7 @@ if ($ExecutionContext.SessionState.LanguageMode -ne "FullLanguage") {
1313 return ;
1414}
1515
16- $Global :__VSCodeState = @ {
16+ $Script :__VSCodeState = @ {
1717 OriginalPrompt = $function: Prompt
1818 LastHistoryId = -1
1919 IsInExecution = $false
@@ -24,21 +24,21 @@ $Global:__VSCodeState = @{
2424}
2525
2626# Store the nonce in script scope and unset the global
27- $Global :__VSCodeState.Nonce = $env: VSCODE_NONCE
27+ $Script :__VSCodeState.Nonce = $env: VSCODE_NONCE
2828$env: VSCODE_NONCE = $null
2929
30- $Global :__VSCodeState.IsStable = $env: VSCODE_STABLE
30+ $Script :__VSCodeState.IsStable = $env: VSCODE_STABLE
3131$env: VSCODE_STABLE = $null
3232
3333$__vscode_shell_env_reporting = $env: VSCODE_SHELL_ENV_REPORTING
3434$env: VSCODE_SHELL_ENV_REPORTING = $null
3535if ($__vscode_shell_env_reporting ) {
36- $Global :__VSCodeState.EnvVarsToReport = $__vscode_shell_env_reporting.Split (' ,'
36+ $Script :__VSCodeState.EnvVarsToReport = $__vscode_shell_env_reporting.Split (' ,'
3737}
3838Remove-Variable - Name __vscode_shell_env_reporting - ErrorAction SilentlyContinue
3939
4040$osVersion = [System.Environment ]::OSVersion.Version
41- $Global :__VSCodeState.IsWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
41+ $Script :__VSCodeState.IsWindows10 = $IsWindows -and $osVersion.Major -eq 10 -and $osVersion.Minor -eq 0 -and $osVersion.Build -lt 22000
4242Remove-Variable - Name osVersion - ErrorAction SilentlyContinue
4343
4444if ($env: VSCODE_ENV_REPLACE ) {
@@ -86,9 +86,9 @@ function Global:Prompt() {
8686 $Result = " "
8787 # Skip finishing the command if the first command has not yet started or an execution has not
8888 # yet begun
89- if ($Global :__VSCodeState.LastHistoryId -ne -1 -and $Global :__VSCodeState.IsInExecution -eq $true ) {
90- $Global :__VSCodeState.IsInExecution = $false
91- if ($LastHistoryEntry.Id -eq $Global :__VSCodeState.LastHistoryId ) {
89+ if ($Script :__VSCodeState.LastHistoryId -ne -1 -and $Script :__VSCodeState.IsInExecution -eq $true ) {
90+ $Script :__VSCodeState.IsInExecution = $false
91+ if ($LastHistoryEntry.Id -eq $Script :__VSCodeState.LastHistoryId ) {
9292 # Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
9393 $Result += " $ ( [char ]0x1b ) ]633;D`a "
9494 }
@@ -107,34 +107,34 @@ function Global:Prompt() {
107107
108108 # Send current environment variables as JSON
109109 # OSC 633 ; EnvJson ; <Environment> ; <Nonce>
110- if ($Global :__VSCodeState.EnvVarsToReport.Count -gt 0 ) {
110+ if ($Script :__VSCodeState.EnvVarsToReport.Count -gt 0 ) {
111111 $envMap = @ {}
112- foreach ($varName in $Global :__VSCodeState.EnvVarsToReport ) {
112+ foreach ($varName in $Script :__VSCodeState.EnvVarsToReport ) {
113113 if (Test-Path " env:$varName "
114114 $envMap [$varName ] = (Get-Item " env:$varName "
115115 }
116116 }
117117 $envJson = $envMap | ConvertTo-Json - Compress
118- $Result += " $ ( [char ]0x1b ) ]633;EnvJson;$ ( __VSCode- Escape- Value $envJson ) ;$ ( $Global :__VSCodeState.Nonce ) `a "
118+ $Result += " $ ( [char ]0x1b ) ]633;EnvJson;$ ( __VSCode- Escape- Value $envJson ) ;$ ( $Script :__VSCodeState.Nonce ) `a "
119119 }
120120
121121 # Before running the original prompt, put $? back to what it was:
122122 if ($FakeCode -ne 0 ) {
123123 Write-Error " failure" - ea ignore
124124 }
125125 # Run the original prompt
126- $OriginalPrompt += $Global :__VSCodeState.OriginalPrompt.Invoke ()
126+ $OriginalPrompt += $Script :__VSCodeState.OriginalPrompt.Invoke ()
127127 $Result += $OriginalPrompt
128128
129129 # Prompt
130130 # OSC 633 ; <Property>=<Value> ST
131- if ($Global :__VSCodeState.IsStable -eq " 0"
131+ if ($Script :__VSCodeState.IsStable -eq " 0"
132132 $Result += " $ ( [char ]0x1b ) ]633;P;Prompt=$ ( __VSCode- Escape- Value $OriginalPrompt ) `a "
133133 }
134134
135135 # Write command started
136136 $Result += " $ ( [char ]0x1b ) ]633;B`a "
137- $Global :__VSCodeState.LastHistoryId = $LastHistoryEntry.Id
137+ $Script :__VSCodeState.LastHistoryId = $LastHistoryEntry.Id
138138 return $Result
139139}
140140
@@ -154,19 +154,19 @@ elseif ((Test-Path variable:global:GitPromptSettings) -and $Global:GitPromptSett
154154if (Get-Module - Name PSReadLine) {
155155 [Console ]::Write(" $ ( [char ]0x1b ) ]633;P;HasRichCommandDetection=True`a "
156156
157- $Global :__VSCodeState.OriginalPSConsoleHostReadLine = $function: PSConsoleHostReadLine
157+ $Script :__VSCodeState.OriginalPSConsoleHostReadLine = $function: PSConsoleHostReadLine
158158 function Global :PSConsoleHostReadLine {
159- $CommandLine = $Global :__VSCodeState.OriginalPSConsoleHostReadLine.Invoke ()
160- $Global :__VSCodeState.IsInExecution = $true
159+ $CommandLine = $Script :__VSCodeState.OriginalPSConsoleHostReadLine.Invoke ()
160+ $Script :__VSCodeState.IsInExecution = $true
161161
162162 # Command line
163163 # OSC 633 ; E [; <CommandLine> [; <Nonce>]] ST
164164 $Result = " $ ( [char ]0x1b ) ]633;E;"
165165 $Result += $ (__VSCode- Escape- Value $CommandLine )
166166 # Only send the nonce if the OS is not Windows 10 as it seems to echo to the terminal
167167 # sometimes
168- if ($Global :__VSCodeState.IsWindows10 -eq $false ) {
169- $Result += " ;$ ( $Global :__VSCodeState.Nonce ) "
168+ if ($Script :__VSCodeState.IsWindows10 -eq $false ) {
169+ $Result += " ;$ ( $Script :__VSCodeState.Nonce ) "
170170 }
171171 $Result += " `a "
172172
@@ -181,9 +181,9 @@ if (Get-Module -Name PSReadLine) {
181181 }
182182
183183 # Set ContinuationPrompt property
184- $Global :__VSCodeState.ContinuationPrompt = (Get-PSReadLineOption ).ContinuationPrompt
185- if ($Global :__VSCodeState.ContinuationPrompt ) {
186- [Console ]::Write(" $ ( [char ]0x1b ) ]633;P;ContinuationPrompt=$ ( __VSCode- Escape- Value $Global :__VSCodeState.ContinuationPrompt ) `a "
184+ $Script :__VSCodeState.ContinuationPrompt = (Get-PSReadLineOption ).ContinuationPrompt
185+ if ($Script :__VSCodeState.ContinuationPrompt ) {
186+ [Console ]::Write(" $ ( [char ]0x1b ) ]633;P;ContinuationPrompt=$ ( __VSCode- Escape- Value $Script :__VSCodeState.ContinuationPrompt ) `a "
187187 }
188188}
189189
0 commit comments