Skip to content

Commit 3c50634

Browse files
LaoujinLaoujin
committed
fix linting -- tests are broken now, is it worth it 😀
1 parent 2be9291 commit 3c50634

9 files changed

Lines changed: 34 additions & 34 deletions

‎Git-NumberedAdd/Git-NumberedAdd.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Set-Alias gunhide Git-NumberedUnhidden
5858
# Displays help for all Git-Numbered actions and utilities
5959
##############################################################################
6060
function Git-NumberedHelp() {
61-
$table = Get-Command -Name "Git-*" | ? { $_.CommandType -eq 'Function' } | % {
61+
$table = Get-Command -Name "Git-*" | Where-Object { $_.CommandType -eq 'Function' } | ForEach-Object {
6262
$name = $_.name
6363
$help = get-help $_ -Full
6464
$example = If ($help.Examples) {$true} Else {''}

‎Git-NumberedAdd/lib/Git-NumberedStatus.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ function Git-NumberedStatus() {
3535
$allFiles = Parse-GitStatus $config.includeNumstat ($args -Join " ")
3636

3737
if ($config.includeNumstat) {
38-
$maxAdded = ($allFiles | ? {$_.added -ne $null} | % {$_.added.ToString().Length} | Measure-Object -Maximum).Maximum + 1
39-
$maxDeleted = ($allFiles | ? {$_.deleted -ne $null} | % {$_.deleted.ToString().Length} | Measure-Object -Maximum).Maximum + 1
38+
$maxAdded = ($allFiles | Where-Object {$null -ne $_.added} | ForEach-Object {$_.added.ToString().Length} | Measure-Object -Maximum).Maximum + 1
39+
$maxDeleted = ($allFiles | Where-Object {$null -ne $_.deleted} | ForEach-Object {$_.deleted.ToString().Length} | Measure-Object -Maximum).Maximum + 1
4040
}
4141

42-
$config.stagingArea = $allFiles | Where staged
42+
$config.stagingArea = $allFiles | Where-Object staged
4343
if ($config.stagingArea.length) {
4444
Write-Host "Staged files:"
45-
$config.stagingArea | % {$index = -1}{
45+
$config.stagingArea | ForEach-Object {$index = -1}{
4646
$index++
4747

4848
$output = Get-FileInfoFormat $maxAdded $maxDeleted $_
@@ -52,10 +52,10 @@ function Git-NumberedStatus() {
5252
}
5353

5454

55-
$config.workingDir = @($allFiles | Where {$_.staged -eq $false})
55+
$config.workingDir = @($allFiles | Where-Object {$_.staged -eq $false})
5656
if ($config.workingDir.length) {
5757
Write-Host "Working directory:"
58-
$config.workingDir | % {$index = -1}{
58+
$config.workingDir | ForEach-Object {$index = -1}{
5959
$index++
6060

6161
$color = switch($_.state) {
@@ -89,8 +89,8 @@ function Get-FileInfoFormat($maxAdded, $maxDeleted, $fileInfo) {
8989
$file = "$file ($($fileInfo.lineEndings))"
9090
}
9191

92-
if ($maxAdded -ne $null) {
93-
if ($fileInfo.added -ne $null) {
92+
if ($null -ne $maxAdded) {
93+
if ($null -ne $fileInfo.added) {
9494
return "{0,3} {1} {2,$maxAdded} {3,$maxDeleted} {4}" -f $index,$fileInfo.state,"+$($fileInfo.added)","-$($fileInfo.deleted)",$file
9595
} else {
9696
return "{0,3} {1} {2,$maxAdded} {3,$maxDeleted} {4}" -f $index,$fileInfo.state,"","",$file

‎Git-NumberedAdd/lib/Parse-GitIndexes.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ function Parse-GitIndexes($argIndexes, $lookIn = "workingDir") {
5858
}
5959
}
6060

61-
$return = $indexes | ? {
61+
$return = $indexes | Where-Object {
6262
if ($_ -ge $allFiles.length) {
6363
Write-Host "$_ is outside of the boundaries of Git-NumberedStatus (Length: $($allFiles.length))" -ForegroundColor DarkMagenta
6464
return $false
6565
}
6666
return $true
67-
} | % { $allFiles[$_] }
67+
} | ForEach-Object { $allFiles[$_] }
6868

6969
if ($commitMsg) {
7070
if ($return -is [array]) {
@@ -87,7 +87,7 @@ function Validate-GitIndexes($indexes) {
8787
return $false
8888
}
8989

90-
if ($indexes.length -eq 0 -or $indexes[0] -eq $null) {
90+
if ($indexes.length -eq 0 -or $null -eq $indexes[0]) {
9191
Write-Host "No arguments? Usage:"
9292
Write-Host "Add the first file: 'Git-NumberedAdd 0'"
9393
Write-Host "Add the first 3 files: 'Git-NumberedAdd 0 1 2' or 'Git-NumberedAdd 0-2' or 'Git-NumberedAdd -3' or 'Git-NumberedAdd 012'"

‎Git-NumberedAdd/lib/Parse-GitStatus.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function Parse-GitStatus($includeNumstat = $false, $extraArgs) {
2929

3030
$allArgs = @('status', '-s')
3131
if ($extraArgs) { $allArgs += $extraArgs }
32-
$allFiles = Invoke-Git @allArgs | % {
32+
$allFiles = Invoke-Git @allArgs | ForEach-Object {
3333
$oldFilename = $null
3434
$relativePath = $_.Substring(3).Replace("`"", "")
3535

@@ -78,7 +78,7 @@ function Parse-GitStatus($includeNumstat = $false, $extraArgs) {
7878
}
7979
return $returns
8080

81-
} | % {$_}
81+
} | ForEach-Object {$_}
8282

8383

8484

@@ -113,8 +113,8 @@ function Add-GitNumstat($allFiles, $staged) {
113113
}
114114

115115

116-
$eolWarnings = $numstatResult | ? { $_ -is [System.Management.Automation.ErrorRecord] }
117-
$eolWarnings | % {
116+
$eolWarnings = $numstatResult | ForEach-Object { $_ -is [System.Management.Automation.ErrorRecord] }
117+
$eolWarnings | ForEach-Object {
118118
$line = $_.Exception.Message
119119
if ($line.StartsWith('The file will have its original line')) {
120120
# Ignore this one
@@ -127,7 +127,7 @@ function Add-GitNumstat($allFiles, $staged) {
127127
$fromEol = $match.matches[0].groups['from']
128128
$toEol = $match.matches[0].groups['to']
129129
$fileName = $match.matches[0].groups['file'].Value.Replace('/', '\')
130-
$matchingStatus = $allFiles | Where {$_.file -eq $fileName}
130+
$matchingStatus = $allFiles | Where-Object {$_.file -eq $fileName}
131131
if ($matchingStatus) {
132132
$matchingStatus | Add-Member -NotePropertyName 'lineEndings' -NotePropertyValue "$fromEol -> $toEol" -Force
133133
}
@@ -136,13 +136,13 @@ function Add-GitNumstat($allFiles, $staged) {
136136
}
137137

138138

139-
$numstatResult = $numstatResult | ? { $_ -isnot [System.Management.Automation.ErrorRecord] }
140-
$numstatResult | % {
139+
$numstatResult = $numstatResult | Where-Object { $_ -isnot [System.Management.Automation.ErrorRecord] }
140+
$numstatResult | ForEach-Object {
141141
# Output format: +++ `t --- `t fileName
142142
$numstat = $_.Trim().Split("`t")
143143
$file = Quote-Path $numstat[2]
144144
$numstat = @{file=$file;added=$numstat[0];deleted=$numstat[1]}
145-
$matchingStatus = $allFiles | Where {$_.staged -eq $staged -and $numstat.file -eq $_.file}
145+
$matchingStatus = $allFiles | Where-Object {$_.staged -eq $staged -and $numstat.file -eq $_.file}
146146

147147
if ($matchingStatus) {
148148
$matchingStatus.added = $numstat.added

‎Git-NumberedAdd/lib/actions/Git-NumberedAdd.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ function Git-NumberedAddPatch {
3636
return
3737
}
3838

39-
$files = $fileInfos | % {$_.fullPath.Trim('"')}
39+
$files = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
4040
git add @files -vp
4141
}

‎Git-NumberedAdd/lib/actions/Git-NumberedCheckout.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ function Git-NumberedCheckout {
88
return
99
}
1010

11-
$toCheckout = $fileInfos | % {$_.fullPath.Trim('"')}
11+
$toCheckout = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
1212
git checkout HEAD @($toCheckout)
1313
}

‎Git-NumberedAdd/lib/actions/Git-NumberedDiff.ps1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# `git diff` the indexes passed as $args in the working directory
44
##############################################################################
55
function Git-NumberedDiff {
6-
if ($args.length -eq 0 -or $args[0] -eq $null) {
6+
if ($args.length -eq 0 -or $null -eq $args[0]) {
77
$args = @("0-$($global:gitStatusNumbers.workingDir.length - 1)")
88
}
99

@@ -14,13 +14,13 @@ function Git-NumberedDiff {
1414

1515
# git add -N, --intent-to-add
1616
# so that new files are shown in the diff
17-
$newFiles = $fileInfos | ? {$_.state -eq 'A'} | % {$_.fullPath.Trim('"')}
17+
$newFiles = $fileInfos | Where-Object {$_.state -eq 'A'} | ForEach-Object {$_.fullPath.Trim('"')}
1818
if ($newFiles) {
1919
git add -Nv @($newFiles)
2020
}
2121

2222
# Filter deleted files from diff (git doesn't like it)
23-
$files = $fileInfos | ? {$_.state -ne 'D'} | % {$_.fullPath.Trim('"')}
23+
$files = $fileInfos | Where-Object {$_.state -ne 'D'} | ForEach-Object {$_.fullPath.Trim('"')}
2424
git diff @($files)
2525
}
2626

@@ -30,7 +30,7 @@ function Git-NumberedDiff {
3030
# `git diff --cached` the indexes passed as $args in the working directory
3131
##############################################################################
3232
function Git-NumberedDiffCached {
33-
if ($args.length -eq 0 -or $args[0] -eq $null) {
33+
if ($args.length -eq 0 -or $null -eq $args[0]) {
3434
if ($global:gitStatusNumbers.stagingArea.length -eq 0) {
3535
Write-Host "Staging area is empty."
3636
return
@@ -43,6 +43,6 @@ function Git-NumberedDiffCached {
4343
return
4444
}
4545

46-
$files = $fileInfos | % {$_.fullPath.Trim('"')}
46+
$files = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
4747
git diff --cached @($files)
4848
}

‎Git-NumberedAdd/lib/actions/Git-NumberedReset.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ function Git-NumberedReset {
88
return
99
}
1010

11-
$toReset = $fileInfos | % {$_.fullPath.Trim('"')}
11+
$toReset = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
1212
git reset HEAD @($toReset)
1313
}

‎Git-NumberedAdd/lib/utility/Git-NumberedAssumed.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function Git-NumberedAssumed {
1111
return
1212
}
1313

14-
$files = $fileInfos | % {$_.fullPath.Trim('"')}
14+
$files = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
1515
git update-index --assume-unchanged @($files)
1616
}
1717

@@ -26,9 +26,9 @@ $global:assumedFiles = @()
2626
# Displays all currently git assumed files with indexes to be used by Git-NumberedUnassumed
2727
##############################################################################
2828
function Git-ListAssumed {
29-
$files = (git ls-files -v) | Where-Object { $_.StartsWith("h") } | % { $_.Substring(2) }
29+
$files = (git ls-files -v) | Where-Object { $_.StartsWith("h") } | ForEach-Object { $_.Substring(2) }
3030
$index = 0
31-
$files | % {
31+
$files | ForEach-Object {
3232
Write-Host "$index $_"
3333
$global:assumedFiles += $_
3434
$index++
@@ -66,7 +66,7 @@ function Git-NumberedHidden {
6666
return
6767
}
6868

69-
$files = $fileInfos | % {$_.fullPath.Trim('"')}
69+
$files = $fileInfos | ForEach-Object {$_.fullPath.Trim('"')}
7070
git update-index --skip-worktree @($files)
7171
}
7272

@@ -81,9 +81,9 @@ $global:hiddenFiles = @()
8181
# Displays all currently git skip worktree files with indexes to be used by Git-NumberedHidden
8282
##############################################################################
8383
function Git-ListHidden {
84-
$files = (git ls-files -v) | Where-Object { $_.StartsWith("S") } | % { $_.Substring(2) }
84+
$files = (git ls-files -v) | Where-Object { $_.StartsWith("S") } | ForEach-Object { $_.Substring(2) }
8585
$index = 0
86-
$files | % {
86+
$files | ForEach-Object {
8787
Write-Host "$index $_"
8888
$global:hiddenFiles += $_
8989
$index++

0 commit comments

Comments
 (0)