.

Author: SimonCropp

docs/diff-tool.custom.md

@@ -39,7 +39,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
         Left: (temp, target) => $"\"custom args \"{target}\" \"{temp}\"",
         Right: (temp, target) => $"\"custom args \"{temp}\" \"{target}\""))!;
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L83-L92' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolBasedOn' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L82-L91' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolBasedOn' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -69,7 +69,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
 
 await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile");
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L103-L114' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolAndLaunch' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L102-L113' title='Snippet source file'>snippet source</a> | <a href='#snippet-AddToolAndLaunch' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

docs/diff-tool.order.md

@@ -51,5 +51,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
 ```cs
 DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L166-L170' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L165-L169' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -59,7 +59,7 @@ public void OrderShouldNotMessWithAddTool()
     public void TextConvention()
     {
         var diffToolPath = FakeDiffTool.Exe;
-        var resolvedTool = DiffTools.AddTool(
+        DiffTools.AddTool(
             name: "MyCustomDiffTool",
             autoRefresh: true,
             isMdi: false,
@@ -69,11 +69,10 @@ public void TextConvention()
                 Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
                 Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),
             exePath: diffToolPath,
-            binaryExtensions: [])!;
-        DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
-        Assert.Equal("MyCustomDiffTool", resolvedTool.Name);
-        Assert.True(DiffTools.TryFindByExtension(".txtConvention", out var forExtension));
-        Assert.Equal("MyCustomDiffTool", forExtension.Name);
+            binaryExtensions: []);
+        var combine = Path.Combine(SourceDirectory, "input.temp.txtConvention");
+        Assert.True(DiffTools.TryFindForInputFilePath(combine, out var tool));
+        Assert.Equal("MyCustomDiffTool", tool.Name);
     }
 
 #if DEBUG

src/DiffEngine/DiffTools_TryFind.cs

@@ -32,6 +32,7 @@ public static bool TryFindForInputFilePath(
 
         return ExtensionLookup.TryGetValue(Path.GetExtension(path), out tool);
     }
+
     public static bool TryFindForInputFilePath(
         CharSpan path,
         [NotNullWhen(true)] out ResolvedTool? tool)
@@ -42,7 +43,7 @@ public static bool TryFindForInputFilePath(
             return tool != null;
         }
 
-        var extension = Path.GetExtension(path).ToString();
+        var extension = PathPolyfill.GetExtension(path).ToString();
         return ExtensionLookup.TryGetValue(extension, out tool);
     }