Skip to content

Modifying tab completion for files to be relative. #626

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

Closed
cdonnellytx wants to merge 3 commits into from
Closed

Modifying tab completion for files to be relative. #626

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7dbf3e
Modifying tab completion for files to be relative.
cdonnellytx Oct 1, 2018
7bb89e4
Modifying tests to return paths with leading "./".
cdonnellytx Oct 1, 2018
a1b7aa1
Removing unnecessary cast.
cdonnellytx Oct 4, 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
20 changes: 12 additions & 8 deletions src/GitTabExpansion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,39 +168,43 @@ function script:gitTfsShelvesets($filter) {
quoteStringWithSpecialChars
}

function script:gitFiles($filter, $files) {
function script:gitFiles($filter, $gitDir, $files) {
[string] $repoDir = Split-Path -Path $gitDir -Parent
Comment thread
cdonnellytx marked this conversation as resolved.
Outdated

$files | Sort-Object |
Where-Object { $_ -like "$filter*" } |
ForEach-Object { Join-Path -Path $repoDir -ChildPath $_ } |
Resolve-Path -Relative |
quoteStringWithSpecialChars
}

function script:gitIndex($GitStatus, $filter) {
gitFiles $filter $GitStatus.Index
gitFiles $filter $GitStatus.GitDir $GitStatus.Index
}

function script:gitAddFiles($GitStatus, $filter) {
gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Added))
gitFiles $filter $GitStatus.GitDir (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Added))
}

function script:gitCheckoutFiles($GitStatus, $filter) {
gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Deleted))
gitFiles $filter $GitStatus.GitDir (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Working.Deleted))
}

function script:gitDiffFiles($GitStatus, $filter, $staged) {
if ($staged) {
gitFiles $filter $GitStatus.Index.Modified
gitFiles $filter $GitStatus.GitDir $GitStatus.Index.Modified
}
else {
gitFiles $filter (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Index.Modified))
gitFiles $filter $GitStatus.GitDir (@($GitStatus.Working.Unmerged) + @($GitStatus.Working.Modified) + @($GitStatus.Index.Modified))
}
}

function script:gitMergeFiles($GitStatus, $filter) {
gitFiles $filter $GitStatus.Working.Unmerged
gitFiles $filter $GitStatus.GitDir $GitStatus.Working.Unmerged
}

function script:gitDeleted($GitStatus, $filter) {
gitFiles $filter $GitStatus.Working.Deleted
gitFiles $filter $GitStatus.GitDir $GitStatus.Working.Deleted
}

function script:gitAliases($filter) {
Expand Down
10 changes: 6 additions & 4 deletions test/TabExpansion.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,13 @@ Describe 'TabExpansion Tests' {
&$gitbin config core.quotepath true # Problematic (default) config

$fileName = "posh$([char]8226)git.txt"
New-Item $fileName -ItemType File
$file = New-Item $fileName -ItemType File
$expected = ($file | Resolve-Path -Relative) # ./posh\u8226git.txt or .\posh\u8226git.txt, depending on OS

$gitStatus = & $module Get-GitStatus

$result = & $module GitTabExpansionInternal 'git add ' $gitStatus
$result | Should BeExactly $fileName
$result | Should BeExactly $expected
}
}

Expand Down Expand Up @@ -299,12 +300,13 @@ Describe 'TabExpansion Tests' {
}
It 'Tab completes add file in working dir with special char as quoted' {
$filename = 'foo{bar} (x86).txt';
New-Item $filename -ItemType File
$file = New-Item $filename -ItemType File
$expected = ($file | Resolve-Path -Relative) # ./posh\u8226git.txt or .\posh\u8226git.txt, depending on OS

$gitStatus = & $module Get-GitStatus

$result = & $module GitTabExpansionInternal 'git add ' $gitStatus
$result | Should BeExactly "'$filename'"
$result | Should BeExactly "'$expected'"
}
}
}