Skip to content

Make formatting of array types consistent #56

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
stinos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make formatting of array types consistent #56

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
17 changes: 13 additions & 4 deletions src/DTW.PS.Beautifier.Main.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,12 +895,20 @@ function Write-TokenContent_Type {
process {
# first, get the type name
[string]$TypeName = $Token.Content
# next, remove any brackets found in the type name (some versions PowerShell include, some don't)
# next, remove any brackets found around the type name (some versions PowerShell include, some don't)
if (($TypeName[0] -eq '[') -and ($TypeName[-1] -eq ']')) {
$TypeName = $TypeName.Substring(1,$TypeName.Length - 2)
$HadSquareBrackets = $true
$SurroundedBySquareBrackets = $true
} else {
$HadSquareBrackets = $false
$SurroundedBySquareBrackets = $false
}
# for array types (e.g. String[] or Object[][] etc), extract bare type
$SquareBracketStart = $TypeName.IndexOf('[')
if ($SquareBracketStart -gt 0) {
$ArrayBrackets = $TypeName.Substring($SquareBracketStart)
$TypeName = $TypeName.Substring(0,$SquareBracketStart)
} else {
$ArrayBrackets = ''
}

# attempt to get official built-in type accelerator name
Expand All @@ -921,7 +929,8 @@ function Write-TokenContent_Type {
} else {
# else it's probably a custom type or class name, let's not touch it.
}
if ($HadSquareBrackets) {
$TypeName = $TypeName + $ArrayBrackets
if ($SurroundedBySquareBrackets) {
# finally re-add [ ] around type name for writing back
$TypeName = '[' + $TypeName + ']'
}
Expand Down