fix: correct dry-run change counts

Author: MaxLogic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v1.5] - 2026-06-24
+
+### Fixed
+
+- Fixed dry-run summaries so they report the same files that a real run would change while still leaving file bytes untouched.
+
 ## [v1.4] - 2026-06-21
 
 ### Fixed

README.md

@@ -122,7 +122,7 @@ Dry run:
 ```
 Would fix: src\Utils\StrTools.pas (mixed bytes; would save UTF-8 (BOM=Y, EOL=CRLF) (dry-run))
 OK   : src\Main.dpr (UTF-8 OK)
-Done in 00:12.384. Files changed: 0. Failures: 0
+Done in 00:12.384. Files would change: 1. Failures: 0
 ```
 
 Actual run:
@@ -135,6 +135,7 @@ Done in 00:08.972. Files changed: 2. Failures: 0
 ```
 
 > When `silent` is enabled, normal output is suppressed, including the summary and JSON summary. In dry-run mode, change messages are phrased as “Would fix”.
+> Dry-run summaries count files that would change; JSON `changed` uses the same would-change count while leaving file bytes untouched.
 
 ---
 

src/EncodingFixTool.dproj

@@ -90,19 +90,19 @@
         <SanitizedProjectName>EncodingFixTool</SanitizedProjectName>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MajorVer>1</VerInfo_MajorVer>
-        <VerInfo_MinorVer>4</VerInfo_MinorVer>
+        <VerInfo_MinorVer>5</VerInfo_MinorVer>
         <VerInfo_Release>0</VerInfo_Release>
         <VerInfo_Build>0</VerInfo_Build>
         <VerInfo_Locale>1045</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.4.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.4.0.0;Comments=;CFBundleName=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.5.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
         <DCC_ExeOutput>..\bin</DCC_ExeOutput>
         <CfgDependentOn>..\..\MaxLogicFoundation\MaxLogicDefault.optset</CfgDependentOn>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
-        <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.4.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=34</VerInfo_Keys>
+        <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.5.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=34</VerInfo_Keys>
         <BT_BuildType>Debug</BT_BuildType>
         <Android_LauncherIcon36>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png</Android_LauncherIcon36>
         <Android_LauncherIcon48>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png</Android_LauncherIcon48>
@@ -141,13 +141,13 @@
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.4.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.4.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.4.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.4.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
@@ -177,7 +177,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.4.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.4.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Manifest_File>(None)</Manifest_File>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>

src/EncodingFixTool.res

@@ -1524,6 +1524,7 @@ class function TEncodingFixTool.RunFromCommandLine: integer;
   lStopwatch: TStopWatch;
   lSilent: boolean;
   lVerbose: boolean;
+  lChangedLabel: string;
   lLoopProc: TProc<integer>;
   lRoot: string;
 begin
@@ -1595,10 +1596,7 @@ class function TEncodingFixTool.RunFromCommandLine: integer;
     begin
       if lChanged then
       begin
-        if not lOptions.DryRun then
-        begin
-          lLocalChanged := 1;
-        end;
+        lLocalChanged := 1;
         if (not lSilent) and (lOptions.OutputFormat = TOutputFormat.ofText) then
         begin
           TSafeConsole.WriteLine(Format('%s: %s (%s)',
@@ -1658,11 +1656,18 @@ class function TEncodingFixTool.RunFromCommandLine: integer;
     [lScannedCount, lChangedCount, lSkippedCount, lFailureCount]));
 end else if not lSilent then
 begin
+  if lOptions.DryRun then
+  begin
+    lChangedLabel := 'Files would change';
+  end else begin
+    lChangedLabel := 'Files changed';
+  end;
   TSafeConsole.WriteLine('');
-  TSafeConsole.WriteLine(Format('Done in %s. Files changed: %d. Failures: %d',
+  TSafeConsole.WriteLine(Format('Done in %s. %s: %d. Failures: %d',
     [FormatDateTime('nn:ss.zzz', // pretty mm:ss.mmm
         EncodeTime(0, lStopwatch.Elapsed.Minutes, lStopwatch.Elapsed.Seconds, lStopwatch.Elapsed.Milliseconds)
         ),
+      lChangedLabel,
       lChangedCount,
       lFailureCount]));
 end;

src/EncodingFixToolCore.pas

@@ -136,6 +136,7 @@ try {
   $lResult = Invoke-Tool @("path=$lRoot", 'recursive=n', 'ext=pas', 'eol=crlf', 'dry')
   Assert-True ($lResult.ExitCode -eq 0) "EOL dry-run should succeed."
   Assert-True ($lResult.Output -match 'Would fix: lfonly\.pas \(Would normalize EOL to CRLF \(dry-run\)\)') "Expected dry-run to report EOL-only normalization."
+  Assert-True ($lResult.Output -match 'Files would change: 1') "Dry-run text summary should report would-change count."
 
   $lBytes = [System.IO.File]::ReadAllBytes($lLfOnlyFile)
   Assert-True (($lBytes | Where-Object { $_ -eq 13 }).Count -eq 0) "Dry-run must not rewrite LF-only file."
@@ -172,6 +173,37 @@ try {
   $lJson = $lResult.Output | ConvertFrom-Json
   Assert-True (($lJson.scanned -eq 2) -and ($lJson.changed -eq 1) -and ($lJson.skipped -eq 1) -and ($lJson.failed -eq 0)) "Expected compact JSON summary counts for AI workflow."
 
+  $lDryJsonRoot = Join-Path $lRoot 'dry-json'
+  New-Item -ItemType Directory -Path $lDryJsonRoot | Out-Null
+  foreach ($i in 1..10) {
+    [System.IO.File]::WriteAllBytes(
+      (Join-Path $lDryJsonRoot "generated$i.pas"),
+      [System.Text.Encoding]::ASCII.GetBytes("unit generated$i;`ninterface`nend.")
+    )
+  }
+
+  $lResult = Invoke-Tool @("path=$lDryJsonRoot", 'preset=delphi-ai', 'format=json', 'dry')
+  Assert-True ($lResult.ExitCode -eq 0) "Dry-run JSON AI workflow should succeed."
+  $lJson = $lResult.Output | ConvertFrom-Json
+  Assert-True (($lJson.scanned -eq 10) -and ($lJson.changed -eq 10) -and ($lJson.skipped -eq 0) -and ($lJson.failed -eq 0)) "Dry-run JSON summary must count files that would change."
+
+  $lDryCrCount = 0
+  Get-ChildItem -LiteralPath $lDryJsonRoot -Filter '*.pas' | ForEach-Object {
+    $lDryCrCount += ([System.IO.File]::ReadAllBytes($_.FullName) | Where-Object { $_ -eq 13 }).Count
+  }
+  Assert-True ($lDryCrCount -eq 0) "Dry-run JSON workflow must not rewrite files."
+
+  $lResult = Invoke-Tool @("path=$lDryJsonRoot", 'preset=delphi-ai', 'format=json')
+  Assert-True ($lResult.ExitCode -eq 0) "Real JSON AI workflow should succeed."
+  $lJson = $lResult.Output | ConvertFrom-Json
+  Assert-True (($lJson.scanned -eq 10) -and ($lJson.changed -eq 10) -and ($lJson.skipped -eq 0) -and ($lJson.failed -eq 0)) "Real JSON summary should match dry-run would-change count."
+
+  $lRealCrCount = 0
+  Get-ChildItem -LiteralPath $lDryJsonRoot -Filter '*.pas' | ForEach-Object {
+    $lRealCrCount += ([System.IO.File]::ReadAllBytes($_.FullName) | Where-Object { $_ -eq 13 }).Count
+  }
+  Assert-True ($lRealCrCount -eq 20) "Real JSON workflow should normalize the ten LF-only files."
+
   $lGlobalRoot = Join-Path $lRoot 'global'
   New-Item -ItemType Directory -Path $lGlobalRoot | Out-Null
   [System.IO.File]::WriteAllBytes(