Skip to content

Uninstall: remove the previous release's Oh My Posh block and validate the profile only in pwsh #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Laurent Zogaj (26zl) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Uninstall: remove the previous release's Oh My Posh block and validate the profile only in pwsh #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/windows-dev-config/steps/powershell-profile.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ function Remove-DevConfigOhMyPoshProfile {
if (-not $profilePath) {
$profilePath = Join-Path ([Environment]::GetFolderPath('MyDocuments')) 'PowerShell\Microsoft.PowerShell_profile.ps1'
}
$original = [string](Read-DevConfigTextFile -Path $profilePath)
# The previous release wrote the block with mixed line endings, so compare normalized text, as setup does.
$original = [string](Read-DevConfigTextFile -Path $profilePath) -replace "`r`n", "`n"
$tokens = $null
$parseErrors = $null
$ast = [System.Management.Automation.Language.Parser]::ParseInput($original, [ref]$tokens, [ref]$parseErrors)
Expand All @@ -130,7 +131,6 @@ function Remove-DevConfigOhMyPoshProfile {
Get-DevConfigOhMyPoshProfileBlock
"$Script:OhMyPoshInitCommand`n | Invoke-Expression`n" -replace "`r`n", "`n"
)
$blocks += @($blocks | ForEach-Object { $_.Replace("`n", "`r`n") })
if ($ast.EndBlock) {
# Match only top-level setup blocks, not examples in strings or custom functions.
foreach ($statement in @($ast.EndBlock.Statements | Sort-Object { $_.Extent.StartOffset } -Descending)) {
Expand All @@ -143,8 +143,11 @@ function Remove-DevConfigOhMyPoshProfile {
}
}
}
# Validate after removing setup blocks, whose leading-pipe syntax requires PowerShell 7.
[void](Get-DevConfigProfileAst -Content $content)
# Only PowerShell 7 can validate its own profile: the block's leading pipe, and anything else pwsh accepts,
# are parse errors in Windows PowerShell, which runs the cleanup. Removal is an exact match at a statement start.
if ($PSVersionTable.PSEdition -ne 'Desktop') {
[void](Get-DevConfigProfileAst -Content $content)
}
if ($CheckOnly) {
return $content -eq $original
}
Expand Down