Skip to content
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

Update to prompt func to allow path/status order swap #544

Merged
merged 11 commits into from
Apr 19, 2018
Merged

Update to prompt func to allow path/status order swap #544

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37f10ee
Update to prompt func to allow path/status order swap
rkeithhill Feb 5, 2018
cd2a85e
Add 32- or 64-bit to window title
rkeithhill Feb 11, 2018
9bd6556
Tweak order of fields in $GitPromptSettings
rkeithhill Feb 12, 2018
a53e408
Set abbrev home dir def to $true, magenta fg on dbg prompt
rkeithhill Feb 17, 2018
5d70345
Add sep between path/status and after both
rkeithhill Feb 18, 2018
22baced
Merge branch 'develop' into rkeithhill/change-debugprompt
rkeithhill Apr 18, 2018
960ec64
Change name of DefaultPromptMiddle and add Expand helper method
rkeithhill Apr 18, 2018
0989d4e
Short-circuit if nothing to do
dahlbyk Apr 18, 2018
763368b
Drop redundant empty checks
dahlbyk Apr 18, 2018
68f569f
Simply Write-Prompt early return, prompt func comments
rkeithhill Apr 19, 2018
ddb0673
Make Write-Prompt returns consistent
dahlbyk Apr 19, 2018
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
10 changes: 3 additions & 7 deletions src/posh-git.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ $GitPromptScriptBlock = {
$prompt = ''

# Write default prompt prefix if not empty.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess we should change the comment to just # Write default prompt prefix.

if ($settings.DefaultPromptPrefix.Text) {
$prompt += Write-Prompt $settings.DefaultPromptPrefix.Expand()
}
$prompt += Write-Prompt $settings.DefaultPromptPrefix.Expand()

# Get the current path - formatted correctly
$promptPath = $settings.DefaultPromptPath.Expand()
Expand All @@ -79,12 +77,10 @@ $GitPromptScriptBlock = {
}

# Write default prompt middle if not empty.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto - drop the if not empty bit.

if ($settings.DefaultPromptBeforeSuffix.Text) {
$prompt += Write-Prompt $settings.DefaultPromptBeforeSuffix.Expand()
}
$prompt += Write-Prompt $settings.DefaultPromptBeforeSuffix.Expand()

# If stopped in the debugger, the prompt needs to indicate that by writing default propmt debug
if ($settings.DefaultPromptDebug.Text -and ((Test-Path Variable:/PSDebugContext) -or [runspace]::DefaultRunspace.Debugger.InBreakpoint)) {
if ((Test-Path Variable:/PSDebugContext) -or [runspace]::DefaultRunspace.Debugger.InBreakpoint) {
$prompt += Write-Prompt $settings.DefaultPromptDebug.Expand()
}

Expand Down