fix #96 by moving statements even if parsing errors exists

Author: gaelcolas

Source/Private/MoveUsingStatements.ps1

@@ -35,10 +35,10 @@ function MoveUsingStatements {
         Write-Debug "No using statement errors found."
         return
     }
-    # Avoid modifying the file if there's other parsing errors than Using Statements misplaced
+
+    # as per issue https://github.com/PoshCode/ModuleBuilder/issues/96
     if ($ParseErrors.Where{$_.ErrorId -ne 'UsingMustBeAtStartOfScript'}) {
-        Write-Warning "Parsing errors found. Skipping moving using statements."
-        return
+        Write-Verbose "Parsing errors found. We'll still attempt to Move using statements."
     }
 
     # Find all Using statements including those non erroring (to conserve their order)
@@ -63,14 +63,16 @@ function MoveUsingStatements {
 
     $ScriptText = $ScriptText.Insert(0, ($StatementsToCopy -join "`r`n") + "`r`n")
 
+    $ParseErrorsAfterMovingUsings = [System.Management.Automation.Language.ParseError[]]::new(0)
+
     # Verify we haven't introduced new Parsing errors
     $null = [System.Management.Automation.Language.Parser]::ParseInput(
         $ScriptText,
         [ref]$null,
-        [ref]$ParseErrors
+        [ref]$ParseErrorsAfterMovingUsings
     )
 
-    if ($ParseErrors) {
+    if ($ParseErrorsAfterMovingUsings.count -gt $ParseErrors.Count) {
         Write-Warning "We introduced parsing error(s) while attempting to move using statements. Cancelling changes."
     } else {
         $null = Set-Content -Value $ScriptText -Path $RootModule -Encoding $Encoding

Tests/Private/MoveUsingStatements.Tests.ps1

@@ -56,13 +56,13 @@ Describe "MoveUsingStatements" {
                 ErrorAfter   = 0
             },
             @{
-                TestCaseName = 'Not move anything if there are (other) parse errors'
+                TestCaseName = 'still move statements if there are (other) parse errors'
                 PSM1File     = "using namespace System.IO`r`n`r`n" +
                 "function x { `r`n}`r`n" +
                 "using namespace System.Drawing`r`n" + # UsingMustBeAtStartOfScript
                 "function y { `r`n}`r`n}" # Extra } at the end
                 ErrorBefore  = 2
-                ErrorAfter   = 2
+                ErrorAfter   = 1
             }
         )
 
@@ -91,6 +91,7 @@ Describe "MoveUsingStatements" {
             $ErrorFound.Count | Should -Be $ErrorAfter
         }
     }
+
     Context "When MoveUsingStatements should do nothing" {
 
         $MoveUsingStatementsCmd = InModuleScope ModuleBuilder {
@@ -103,16 +104,6 @@ Describe "MoveUsingStatements" {
             }
         }
 
-        It 'Should Warn and skip when there are Parsing errors other than Using Statements' {
-            $testModuleFile = "$TestDrive/MyModule.psm1"
-            $PSM1File = "Using namespace System.IO`r`n function xyz {}`r`n}`r`nUsing namespace System.Drawing" # extra }                Set-Content $testModuleFile -value $PSM1File -Encoding UTF8
-            Set-Content $testModuleFile -value $PSM1File -Encoding UTF8
-
-            &$MoveUsingStatementsCmd -RootModule $testModuleFile
-            Assert-MockCalled -CommandName Write-Warning -Times 1 -ModuleName ModuleBuilder
-            Assert-MockCalled -CommandName Set-Content -Times 0 -ModuleName ModuleBuilder
-        }
-
         It 'Should not do anything when there are no using statement errors' {
             $testModuleFile = "$TestDrive\MyModule.psm1"
             $PSM1File = "using namespace System.IO; function x {}"