Join-PipeScript: Fixing multiple unnamed joins (Fixes #289)

James Brundage · James Brundage · commit 6fe2ff940661 · 2022-11-13T13:51:57.000-08:00
diff --git a/Join-PipeScript.ps1 b/Join-PipeScript.ps1
@@ -388,21 +388,27 @@ function Join-PipeScript
                             if ($block.Unnamed -and -not $blockOpen) {
                                 ' ' * ($block | MeasureIndent) + 'end {'
                                 $blockOpen = $true
+                                $closeEndBlock = $true
                             }
                             if ($StatementsToAdd) {
                                 $StatementsToAdd -join [Environment]::NewLine
                                 $StatementsToAdd = $null
                             }
-                            $block.Extent.ToString() -replace '^end\s{0,}\{' -replace '\}$' -replace '^param\(\)[\s\r\n]{0,}'
+                            if ($block.Unnamed) {
+                                $block.Extent.ToString()
+                            } else {
+                                $block.Extent.ToString() -replace '^end\s{0,}\{' -replace '\}$' -replace '^param\(\)[\s\r\n]{0,}'
+                            }                            
                         }
                     }
 
                     if ($StatementsToAdd) {
                         if ($closeEndBlock -and -not $blockOpen) {
                             'end {'
+                            $blockOpen = $true
                         }
                         $StatementsToAdd -join [Environment]::NewLine
-                        $StatementsToAdd = $null
+                        $StatementsToAdd = $null                        
                     }
 
                     # If we need to close the end block, and it is open,

Original file line number	Diff line number	Diff line change
`@@ -388,21 +388,27 @@ function Join-PipeScript`
`388`	`388`	`if ($block.Unnamed -and -not $blockOpen) {`
`389`	`389`	`' ' * ($block \| MeasureIndent) + 'end {'`
`390`	`390`	`$blockOpen = $true`
	`391`	`+ $closeEndBlock = $true`
`391`	`392`	`}`
`392`	`393`	`if ($StatementsToAdd) {`
`393`	`394`	`$StatementsToAdd -join [Environment]::NewLine`
`394`	`395`	`$StatementsToAdd = $null`
`395`	`396`	`}`
`396`		`- $block.Extent.ToString() -replace '^end\s{0,}\{' -replace '\}$' -replace '^param\(\)[\s\r\n]{0,}'`
	`397`	`+ if ($block.Unnamed) {`
	`398`	`+ $block.Extent.ToString()`
	`399`	`+ } else {`
	`400`	`+ $block.Extent.ToString() -replace '^end\s{0,}\{' -replace '\}$' -replace '^param\(\)[\s\r\n]{0,}'`
	`401`	`+ }`
`397`	`402`	`}`
`398`	`403`	`}`
`399`	`404`
`400`	`405`	`if ($StatementsToAdd) {`
`401`	`406`	`if ($closeEndBlock -and -not $blockOpen) {`
`402`	`407`	`'end {'`
	`408`	`+ $blockOpen = $true`
`403`	`409`	`}`
`404`	`410`	`$StatementsToAdd -join [Environment]::NewLine`
`405`		`- $StatementsToAdd = $null`
	`411`	`+ $StatementsToAdd = $null`
`406`	`412`	`}`
`407`	`413`
`408`	`414`	`# If we need to close the end block, and it is open,`