🐛 Reset-PSKoan: Fixes bug with start position offset (#310)

* Fixes bug with start position offset * Fixes variable name * Adds test for aligned Start and End offset
vexx32 · Oct 28, 2019 · 38f8c5e · 38f8c5e
1 parent 75c26ef
commit 38f8c5e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/PSKoans/Private/Get-KoanAst.ps1 b/PSKoans/Private/Get-KoanAst.ps1
@@ -31,9 +31,16 @@ function Get-KoanAst {
             $tokens = $errors = $null
 
             # Remove the "using module" line. Avoids a slow call to Get-Module -ListAvailable from "using module".
-            $content = Get-Content -Path $Path |
-                Where-Object { $_ -notmatch '^\s*using module' } |
-                Out-String
+            $content = Get-Content -Path $Path -Raw
+            foreach ($match in [Regex]::Matches($content, 'using module \S+')) {
+                $content = $content.Remove(
+                    $match.Index,
+                    $match.Length
+                ).Insert(
+                    $match.Index,
+                    ' ' * $match.Length
+                )
+            }
 
             [Parser]::ParseInput(
                 $content,

diff --git a/Tests/Functions/Private/Get-KoanAst.Tests.ps1 b/Tests/Functions/Private/Get-KoanAst.Tests.ps1
@@ -31,5 +31,27 @@ InModuleScope PSKoans {
 
             $ast.UsingStatements | Should -BeNullOrEmpty
         }
+
+        It 'When reading and modifying the source, position data is consistent' {
+            $tokens = $errors = @()
+            $originalAst = [System.Management.Automation.Language.Parser]::ParseFile(
+                $path,
+                [Ref]$tokens,
+                [Ref]$errors
+            )
+            $originalItBlock = $originalAst.Find( {
+                $args[0] -is [System.Management.Automation.Language.CommandAst] -and
+                $args[0].GetCommandName() -eq 'It'
+            }, $true)
+
+            $modifiedAst = Get-KoanAst -Path $path
+            $modifiedItBlock = $modifiedAst.Find( {
+                $args[0] -is [System.Management.Automation.Language.CommandAst] -and
+                $args[0].GetCommandName() -eq 'It'
+            }, $true)
+
+            $modifiedItBlock.Extent.StartOffset | Should -Be $originalItBlock.Extent.StartOffset
+            $modifiedItBlock.Extent.EndOffset | Should -Be $originalItBlock.Extent.EndOffset
+        }
     }
 }