Skip to content

Commit 0c0ef96

Browse files
SimonCroppSimonCropp
committed
cleanup
1 parent 7597200 commit 0c0ef96

30 files changed

Lines changed: 89 additions & 232 deletions

‎src/DiffEngine.Tests/OsSettingsResolverTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public void EnvVar()
4949
}
5050

5151
var found = OsSettingsResolver.Resolve(
52-
new(Windows: new("ComSpec", "cmd.exe", launchArguments, "")),
52+
"ComSpec",
53+
new(Windows: new("cmd.exe", launchArguments, "")),
5354
out var filePath,
5455
out var launchArgs);
5556
Assert.Equal(true, found);

‎src/DiffEngine.Tests/diffTools.include.md‎

Lines changed: 45 additions & 90 deletions
Large diffs are not rendered by default.

‎src/DiffEngine/DiffTools_Add.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static partial class DiffTools
2121

2222
static ResolvedTool? AddTool(string name, DiffTool? diffTool, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport)
2323
{
24-
if (!OsSettingsResolver.Resolve(osSupport, out var exePath, out var launchArguments))
24+
if (!OsSettingsResolver.Resolve(name, osSupport, out var exePath, out var launchArguments))
2525
{
2626
return null;
2727
}

‎src/DiffEngine/Implementation/AraxisMerge.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
static partial class Implementation
22
{
3-
public static Definition AraxisMerge()
4-
{
5-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.AraxisMerge)}";
6-
return new(
3+
public static Definition AraxisMerge() =>
4+
new(
75
Tool: DiffTool.AraxisMerge,
86
Url: "https://www.araxis.com/merge",
97
AutoRefresh: true,
@@ -38,14 +36,12 @@ public static Definition AraxisMerge()
3836
},
3937
OsSupport: new(
4038
Windows: new(
41-
environmentVariable,
4239
"Compare.exe",
4340
new(
4441
Left: (temp, target) => $"/nowait \"{target}\" \"{temp}\"",
4542
Right: (temp, target) => $"/nowait \"{temp}\" \"{target}\""),
4643
@"%ProgramFiles%\Araxis\Araxis Merge\"),
4744
Osx: new(
48-
environmentVariable,
4945
"compare",
5046
new(
5147
Left: (temp, target) => $"-nowait \"{target}\" \"{temp}\"",
@@ -57,6 +53,5 @@ public static Definition AraxisMerge()
5753
* [MacOS command line usage](https://www.araxis.com/merge/documentation-os-x/command-line.en)
5854
* [Installing MacOS command line](https://www.araxis.com/merge/documentation-os-x/installing.en)
5955
""");
60-
}
6156
//TODO: add doco about auto refresh
6257
}

‎src/DiffEngine/Implementation/BeyondCompare.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ static string RightOsxLinuxArguments(string temp, string target)
2222
return $"-solo -leftreadonly \"{temp}\" \"{target}\"";
2323
}
2424

25-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.BeyondCompare)}";
2625
return new(
2726
Tool: DiffTool.BeyondCompare,
2827
Url: "https://www.scootersoftware.com",
@@ -48,21 +47,18 @@ static string RightOsxLinuxArguments(string temp, string target)
4847
},
4948
OsSupport: new(
5049
Windows: new(
51-
environmentVariable,
5250
"BCompare.exe",
5351
new(
5452
LeftWindowsArguments,
5553
RightWindowsArguments),
5654
@"%ProgramFiles%\Beyond Compare *\"),
5755
Linux: new(
58-
environmentVariable,
5956
"bcomp",
6057
new(
6158
LeftOsxLinuxArguments,
6259
RightOsxLinuxArguments),
6360
"/usr/lib/beyondcompare/"),
6461
Osx: new(
65-
environmentVariable,
6662
"bcomp",
6763
new(
6864
LeftOsxLinuxArguments,

‎src/DiffEngine/Implementation/CodeCompare.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
static partial class Implementation
22
{
3-
public static Definition CodeCompare()
4-
{
5-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.CodeCompare)}";
6-
return new(
3+
public static Definition CodeCompare() =>
4+
new(
75
Tool: DiffTool.CodeCompare,
86
Url: "https://www.devart.com/codecompare/",
97
AutoRefresh: false,
@@ -14,12 +12,10 @@ public static Definition CodeCompare()
1412
BinaryExtensions: Array.Empty<string>(),
1513
OsSupport: new(
1614
Windows: new(
17-
environmentVariable,
1815
"CodeCompare.exe",
1916
new(
2017
Left: (temp, target) => $"\"{target}\" \"{temp}\"",
2118
Right: (temp, target) => $"\"{temp}\" \"{target}\""),
2219
@"%ProgramFiles%\Devart\Code Compare\")),
2320
Notes: @" * [Command line reference](https://docs.devart.com/code-compare/using-command-line/comparing-via-command-line.html)");
24-
}
2521
}

‎src/DiffEngine/Implementation/DeltaWalker.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ public static Definition DeltaWalker()
66
Left: (temp, target) => $"-mi \"{target}\" \"{temp}\"",
77
Right: (temp, target) => $"-mi \"{temp}\" \"{target}\"");
88

9-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.DeltaWalker)}";
10-
119
return new(
1210
Tool: DiffTool.DeltaWalker,
1311
Url: "https://www.deltawalker.com/",
@@ -54,12 +52,10 @@ public static Definition DeltaWalker()
5452
},
5553
OsSupport: new(
5654
Osx: new(
57-
environmentVariable,
5855
"DeltaWalker",
5956
launchArguments,
6057
"/Applications/DeltaWalker.app/Contents/MacOS/"),
6158
Windows: new(
62-
environmentVariable,
6359
"DeltaWalker.exe",
6460
launchArguments,
6561
@"C:\Program Files\Deltopia\DeltaWalker\")),

‎src/DiffEngine/Implementation/DiffMerge.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ public static Definition DiffMerge()
66
Left: (temp, target) => $"--nosplash \"{target}\" \"{temp}\"",
77
Right: (temp, target) => $"--nosplash \"{temp}\" \"{target}\"");
88

9-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.DiffMerge)}";
109
return new(
1110
Tool: DiffTool.DiffMerge,
1211
Url: "https://www.sourcegear.com/diffmerge/",

‎src/DiffEngine/Implementation/Diffinity.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
static partial class Implementation
22
{
3-
public static Definition Diffinity()
4-
{
5-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.Diffinity)}";
6-
return new(
3+
public static Definition Diffinity() =>
4+
new(
75
Tool: DiffTool.Diffinity,
86
Url: "https://truehumandesign.se/s_diffinity.php",
97
AutoRefresh: true,
@@ -14,7 +12,6 @@ public static Definition Diffinity()
1412
BinaryExtensions: Array.Empty<string>(),
1513
OsSupport: new(
1614
Windows: new(
17-
environmentVariable,
1815
"Diffinity.exe",
1916
new(
2017
Left: (temp, target) => $"\"{target}\" \"{temp}\"",
@@ -24,5 +21,4 @@ public static Definition Diffinity()
2421
* Disable single instance:
2522
\ Preferences \ Tabs \ uncheck `Use single instance and open new diffs in tabs`.
2623
""");
27-
}
2824
}

‎src/DiffEngine/Implementation/ExamDiff.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ static string RightArguments(string temp, string target)
1616
return $"\"{temp}\" \"{target}\" /nh /diffonly /dn1:{tempTitle} /dn2:{targetTitle}";
1717
}
1818

19-
var environmentVariable = $"${DefaultEnvironmentVariablePrefix}_{nameof(DiffTool.ExamDiff)}";
2019
return new(
2120
Tool: DiffTool.ExamDiff,
2221
Url: "https://www.prestosoft.com/edp_examdiffpro.asp",
@@ -28,7 +27,6 @@ static string RightArguments(string temp, string target)
2827
BinaryExtensions: Array.Empty<string>(),
2928
OsSupport: new(
3029
Windows: new(
31-
environmentVariable,
3230
"ExamDiff.exe",
3331
new(LeftArguments, RightArguments),
3432
@"%ProgramFiles%\ExamDiff Pro\")),

0 commit comments

Comments
 (0)