OrderShouldNotMessWithAddTool

Author: SimonCropp

docs/diff-tool.custom.md

@@ -20,7 +20,7 @@ var resolvedTool = DiffTools.AddTool(
     requiresTarget: true,
     arguments: (temp, target) => $"\"{temp}\" \"{target}\"",
     exePath: diffToolPath,
-    binaryExtensions: new[] {"jpg"});
+    binaryExtensions: new[] {"jpg"})!;
 ```
 <sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L23-L33' title='File snippet `addtool` was extracted from'>snippet source</a> | <a href='#snippet-addtool' title='Navigate to start of snippet `addtool`'>anchor</a></sup>
 <!-- endsnippet -->
@@ -39,5 +39,5 @@ var resolvedTool = DiffTools.AddToolBasedOn(
     name: "MyCustomDiffTool",
     arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\"");
 ```
-<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L43-L48' title='File snippet `addtoolbasedon` was extracted from'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Navigate to start of snippet `addtoolbasedon`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L62-L67' title='File snippet `addtoolbasedon` was extracted from'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Navigate to start of snippet `addtoolbasedon`'>anchor</a></sup>
 <!-- endsnippet -->

docs/diff-tool.order.md

@@ -47,5 +47,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#L83-L85' title='File snippet `useorder` was extracted from'>snippet source</a> | <a href='#snippet-useorder' title='Navigate to start of snippet `useorder`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L102-L104' title='File snippet `useorder` was extracted from'>snippet source</a> | <a href='#snippet-useorder' title='Navigate to start of snippet `useorder`'>anchor</a></sup>
 <!-- endsnippet -->

src/DiffEngine.Tests/DiffToolsTest.cs

@@ -29,11 +29,30 @@ public void AddTool()
             requiresTarget: true,
             arguments: (temp, target) => $"\"{temp}\" \"{target}\"",
             exePath: diffToolPath,
-            binaryExtensions: new[] {"jpg"});
+            binaryExtensions: new[] {"jpg"})!;
         #endregion
-        Assert.Equal(resolvedTool, DiffTools.Resolved.First());
+        Assert.Equal(resolvedTool.Name, DiffTools.Resolved.First().Name);
         Assert.True(DiffTools.TryFind("jpg", out var forExtension));
-        Assert.Equal(resolvedTool, forExtension);
+        Assert.Equal(resolvedTool.Name, forExtension!.Name);
+    }
+
+    [Fact]
+    public void OrderShouldNotMessWithAddTool()
+    {
+        string diffToolPath = FakeDiffTool.Exe;
+        var resolvedTool = DiffTools.AddTool(
+            name: "MyCustomDiffTool",
+            autoRefresh: true,
+            isMdi: false,
+            supportsText: true,
+            requiresTarget: true,
+            arguments: (temp, target) => $"\"{temp}\" \"{target}\"",
+            exePath: diffToolPath,
+            binaryExtensions: Enumerable.Empty<string>())!;
+        DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
+        Assert.Equal(resolvedTool.Name, DiffTools.Resolved.First().Name);
+        Assert.True(DiffTools.TryFind("txt", out var forExtension));
+        Assert.Equal(resolvedTool.Name, forExtension!.Name);
     }
 
 #if DEBUG

src/DiffEngine/DiffTools.cs

@@ -119,17 +119,21 @@ public static class DiffTools
                 return null;
             }
 
-            var binariesList = binaries.ToList();
-            var resolvedTool = new ResolvedTool(name, diffTool, resolvedExePath, arguments, isMdi, autoRefresh, binariesList, requiresTarget, supportsText);
+            var resolvedTool = new ResolvedTool(name, diffTool, resolvedExePath, arguments, isMdi, autoRefresh, binaries.ToList(), requiresTarget, supportsText);
 
+            AddResolvedToolAtStart(resolvedTool);
+
+            return resolvedTool;
+        }
+
+        static void AddResolvedToolAtStart(ResolvedTool resolvedTool)
+        {
             resolved.Insert(0, resolvedTool);
-            foreach (var extension in binariesList)
+            foreach (var extension in resolvedTool.BinaryExtensions)
             {
                 var cleanedExtension = Extensions.GetExtension(extension);
                 ExtensionLookup[cleanedExtension] = resolvedTool;
             }
-
-            return resolvedTool;
         }
 
         static DiffTools()
@@ -139,20 +143,29 @@ static DiffTools()
 
         internal static void Reset()
         {
+            ExtensionLookup.Clear();
+            resolved.Clear();
             var result = OrderReader.ReadToolOrder();
 
             InitTools(result.FoundInEnvVar, result.Order);
         }
 
         static void InitTools(bool resultFoundInEnvVar, IEnumerable<DiffTool> tools)
         {
+            var custom = resolved.Where(x=>x.Tool == null).ToList();
             ExtensionLookup.Clear();
             resolved.Clear();
 
             foreach (var tool in ToolsOrder.Sort(resultFoundInEnvVar, tools).Reverse())
             {
                 AddTool(tool.Tool.ToString(), tool.Tool, tool.AutoRefresh, tool.IsMdi, tool.SupportsText, tool.RequiresTarget, tool.BinaryExtensions, tool.Windows, tool.Linux, tool.Osx);
             }
+
+            custom.Reverse();
+            foreach (var tool in custom)
+            {
+                AddResolvedToolAtStart(tool);
+            }
         }
 
         public static void UseOrder(params DiffTool[] order)