EmptyFiles" Version="3.0.0"

SimonCropp · SimonCropp · commit 060209838264 · 2022-10-17T09:22:22.000+11:00
diff --git a/src/DiffEngine/DiffEngine.csproj b/src/DiffEngine/DiffEngine.csproj
@@ -15,7 +15,7 @@
     <Using Include="System.Net.Sockets" />
     <Using Include="EmptyFiles" />
     <PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All" />
-    <PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
+    <PackageReference Include="EmptyFiles" Version="3.0.0" PrivateAssets="None" />
     <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
diff --git a/src/DiffEngine/DiffRunner.cs b/src/DiffEngine/DiffRunner.cs
@@ -40,7 +40,7 @@ public static LaunchResult Launch(string tempFile, string targetFile)
         return InnerLaunch(
             ([NotNullWhen(true)] out ResolvedTool? tool) =>
             {
-                var extension = Extensions.GetExtension(tempFile);
+                var extension = FileExtensions.GetExtension(tempFile);
                 return DiffTools.TryFindByExtension(extension, out tool);
             },
             tempFile,
@@ -57,7 +57,7 @@ public static Task<LaunchResult> LaunchAsync(string tempFile, string targetFile)
         return InnerLaunchAsync(
             ([NotNullWhen(true)] out ResolvedTool? tool) =>
             {
-                var extension = Extensions.GetExtension(tempFile);
+                var extension = FileExtensions.GetExtension(tempFile);
                 return DiffTools.TryFindByExtension(extension, out tool);
             },
             tempFile,
diff --git a/src/DiffEngine/DiffRunner_Kill.cs b/src/DiffEngine/DiffRunner_Kill.cs
@@ -12,7 +12,7 @@ public static void Kill(string tempFile, string targetFile)
             return;
         }
 
-        var extension = Extensions.GetExtension(tempFile);
+        var extension = FileExtensions.GetExtension(tempFile);
         if (!DiffTools.TryFindByExtension(extension, out var diffTool))
         {
             Logging.Write($"Extension not found. {extension}");
diff --git a/src/DiffEngine/DiffTools.cs b/src/DiffEngine/DiffTools.cs
@@ -37,15 +37,15 @@ public static void UseOrder(in bool throwForNoTool, params DiffTool[] order)
 
     public static bool IsDetectedFor(DiffTool diffTool, string extensionOrPath)
     {
-        var extension = Extensions.GetExtension(extensionOrPath);
+        var extension = FileExtensions.GetExtension(extensionOrPath);
 
         var tool = resolved.SingleOrDefault(_ => _.Tool == diffTool);
         if (tool == null)
         {
             return false;
         }
 
-        if (Extensions.IsText(extension))
+        if (FileExtensions.IsText(extension))
         {
             return tool.SupportsText;
         }
diff --git a/src/DiffEngine/DiffTools_Add.cs b/src/DiffEngine/DiffTools_Add.cs
@@ -54,7 +54,7 @@ static void AddResolvedToolAtStart(ResolvedTool resolvedTool)
         resolved.Insert(0, resolvedTool);
         foreach (var extension in resolvedTool.BinaryExtensions)
         {
-            var cleanedExtension = Extensions.GetExtension(extension);
+            var cleanedExtension = FileExtensions.GetExtension(extension);
             ExtensionLookup[cleanedExtension] = resolvedTool;
         }
 
diff --git a/src/DiffEngine/DiffTools_TryFind.cs b/src/DiffEngine/DiffTools_TryFind.cs
@@ -11,8 +11,8 @@ public static bool TryFindByExtension(
         string extension,
         [NotNullWhen(true)] out ResolvedTool? tool)
     {
-        extension = Extensions.GetExtension(extension);
-        if (Extensions.IsText(extension))
+        extension = FileExtensions.GetExtension(extension);
+        if (FileExtensions.IsText(extension))
         {
             tool = resolved.FirstOrDefault(_ => _.SupportsText);
             return tool != null;
diff --git a/src/DiffEngine/Implementation/P4Merge.cs b/src/DiffEngine/Implementation/P4Merge.cs
@@ -5,7 +5,7 @@ public static Definition P4Merge()
         var launchArguments = new LaunchArguments(
             Left: (temp, target) =>
             {
-                if (Extensions.IsText(temp))
+                if (FileExtensions.IsText(temp))
                 {
                     return $"\"{target}\" \"{temp}\"";
                 }
@@ -14,7 +14,7 @@ public static Definition P4Merge()
             },
             Right: (temp, target) =>
             {
-                if (Extensions.IsText(temp))
+                if (FileExtensions.IsText(temp))
                 {
                     return $"\"{temp}\" \"{target}\"";
                 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static void Kill(string tempFile, string targetFile)`
`12`	`12`	`return;`
`13`	`13`	`}`
`14`	`14`
`15`		`- var extension = Extensions.GetExtension(tempFile);`
	`15`	`+ var extension = FileExtensions.GetExtension(tempFile);`
`16`	`16`	`if (!DiffTools.TryFindByExtension(extension, out var diffTool))`
`17`	`17`	`{`
`18`	`18`	`Logging.Write($"Extension not found. {extension}");`
Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ public static void UseOrder(in bool throwForNoTool, params DiffTool[] order)`
`37`	`37`
`38`	`38`	`public static bool IsDetectedFor(DiffTool diffTool, string extensionOrPath)`
`39`	`39`	`{`
`40`		`- var extension = Extensions.GetExtension(extensionOrPath);`
	`40`	`+ var extension = FileExtensions.GetExtension(extensionOrPath);`
`41`	`41`
`42`	`42`	`var tool = resolved.SingleOrDefault(_ => _.Tool == diffTool);`
`43`	`43`	`if (tool == null)`
`44`	`44`	`{`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (Extensions.IsText(extension))`
	`48`	`+ if (FileExtensions.IsText(extension))`
`49`	`49`	`{`
`50`	`50`	`return tool.SupportsText;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static void AddResolvedToolAtStart(ResolvedTool resolvedTool)`
`54`	`54`	`resolved.Insert(0, resolvedTool);`
`55`	`55`	`foreach (var extension in resolvedTool.BinaryExtensions)`
`56`	`56`	`{`
`57`		`- var cleanedExtension = Extensions.GetExtension(extension);`
	`57`	`+ var cleanedExtension = FileExtensions.GetExtension(extension);`
`58`	`58`	`ExtensionLookup[cleanedExtension] = resolvedTool;`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public static bool TryFindByExtension(`
`11`	`11`	`string extension,`
`12`	`12`	`[NotNullWhen(true)] out ResolvedTool? tool)`
`13`	`13`	`{`
`14`		`- extension = Extensions.GetExtension(extension);`
`15`		`- if (Extensions.IsText(extension))`
	`14`	`+ extension = FileExtensions.GetExtension(extension);`
	`15`	`+ if (FileExtensions.IsText(extension))`
`16`	`16`	`{`
`17`	`17`	`tool = resolved.FirstOrDefault(_ => _.SupportsText);`
`18`	`18`	`return tool != null;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public static Definition P4Merge()`
`5`	`5`	`var launchArguments = new LaunchArguments(`
`6`	`6`	`Left: (temp, target) =>`
`7`	`7`	`{`
`8`		`- if (Extensions.IsText(temp))`
	`8`	`+ if (FileExtensions.IsText(temp))`
`9`	`9`	`{`
`10`	`10`	`return $"\"{target}\" \"{temp}\"";`
`11`	`11`	`}`
`@@ -14,7 +14,7 @@ public static Definition P4Merge()`
`14`	`14`	`},`
`15`	`15`	`Right: (temp, target) =>`
`16`	`16`	`{`
`17`		`- if (Extensions.IsText(temp))`
	`17`	`+ if (FileExtensions.IsText(temp))`
`18`	`18`	`{`
`19`	`19`	`return $"\"{temp}\" \"{target}\"";`
`20`	`20`	`}`