Skip to content

Commit 77c9340

Browse files
SimonCroppSimonCropp
committed
cleanup
1 parent 3bb551c commit 77c9340

35 files changed

+262
-176
lines changed

‎src/DiffEngine.Tests/AssemblyLocation.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// ReSharper disable RedundantSuppressNullableWarningExpression
2+
23
static class AssemblyLocation
34
{
45
static AssemblyLocation()

‎src/DiffEngine.Tests/DiffEngine.Tests.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<NoWarn>SYSLIB0012</NoWarn>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
11-
<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.3.0" PrivateAssets="all" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
14-
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
15-
<PackageReference Include="Xunit" Version="2.4.1" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
17-
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all" />
18-
<PackageReference Include="XunitContext" Version="3.2.1" />
19-
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
10+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
11+
<PackageReference Include="MarkdownSnippets.MsBuild" Version="24.3.0" PrivateAssets="all"/>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
13+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
14+
<PackageReference Include="System.Drawing.Common" Version="5.0.0"/>
15+
<PackageReference Include="Xunit" Version="2.4.1"/>
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all"/>
17+
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
18+
<PackageReference Include="XunitContext" Version="3.2.1"/>
19+
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj"/>
2020
</ItemGroup>
2121
</Project>

‎src/DiffEngine/DiffEngine.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;netcoreapp2.0;net48</TargetFrameworks>
77
</PropertyGroup>
88
<ItemGroup>
9-
<Using Remove="System.Net.Http" />
10-
<PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All" />
11-
<PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
12-
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
14-
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all" />
15-
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
16-
<PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="All" />
17-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'" />
18-
<PackageReference Include="System.Management" Version="5.0.0" />
9+
<Using Remove="System.Net.Http"/>
10+
<PackageReference Include="Caseless.Fody" Version="1.9.1" PrivateAssets="All"/>
11+
<PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None"/>
12+
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all"/>
13+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'"/>
14+
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
15+
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all"/>
16+
<PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="All"/>
17+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'"/>
18+
<PackageReference Include="System.Management" Version="5.0.0"/>
1919
</ItemGroup>
2020
</Project>

‎src/DiffEngine/FodyWeavers.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" GenerateXsd="false">
2-
<Caseless />
1+
<Weavers GenerateXsd="false">
2+
<Caseless/>
33
</Weavers>

‎src/DiffEngine/Implementation/Vim.cs

+9-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ static partial class Implementation
44
{
55
public static Definition Vim()
66
{
7-
static string TargetLeftArguments(string temp, string target) =>
8-
$"-d \"{target}\" \"{temp}\" -c \"setl autoread | setl nobackup | set noswapfile\"";
9-
static string TargetRightArguments(string temp, string target) =>
10-
$"-d \"{temp}\" \"{target}\" -c \"setl autoread | setl nobackup | set noswapfile\"";
7+
static string TargetLeftArguments(string temp, string target)
8+
{
9+
return $"-d \"{target}\" \"{temp}\" -c \"setl autoread | setl nobackup | set noswapfile\"";
10+
}
11+
12+
static string TargetRightArguments(string temp, string target)
13+
{
14+
return $"-d \"{temp}\" \"{target}\" -c \"setl autoread | setl nobackup | set noswapfile\"";
15+
}
1116

1217
return new(
1318
name: DiffTool.Vim,

‎src/DiffEngine/Implementation/VsCode.cs

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ static partial class Implementation
44
{
55
public static Definition VsCode()
66
{
7-
static string TargetLeftArguments(string temp, string target) =>
8-
$"--diff \"{target}\" \"{temp}\"";
7+
static string TargetLeftArguments(string temp, string target)
8+
{
9+
return $"--diff \"{target}\" \"{temp}\"";
10+
}
911

10-
static string TargetRightArguments(string temp, string target) =>
11-
$"--diff \"{temp}\" \"{target}\"";
12+
static string TargetRightArguments(string temp, string target)
13+
{
14+
return $"--diff \"{temp}\" \"{target}\"";
15+
}
1216

1317
return new(
1418
name: DiffTool.VisualStudioCode,

‎src/DiffEngine/InternalsVisibleTo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[assembly:InternalsVisibleTo("DiffEngine.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
2-
[assembly:InternalsVisibleTo("DiffEngineTray, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
3-
[assembly:InternalsVisibleTo("DiffEngineTray.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
1+
[assembly: InternalsVisibleTo("DiffEngine.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
2+
[assembly: InternalsVisibleTo("DiffEngineTray, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]
3+
[assembly: InternalsVisibleTo("DiffEngineTray.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f0a8e4bf1639dce01be6592384e7dfc621915b7759fb5cee42ec5d351bcc43460432da1659ee618ca6cab6b8b8e56a5deb5d4ee1a49783d5c2690752502d31ccbfee9b2c697e20359b55ad100cc9370c8e983fd9496f01d761a060d0435bac7243b1832ba95757aa5adbb67df38c213d717b6751e1217cea9fa5c61e9b799dd")]

‎src/DiffEngine/MaxInstance.cs

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static void SetForUser(int value)
3333
{
3434
return;
3535
}
36+
3637
MaxInstancesToLaunch = value;
3738
string? envVariable;
3839
if (value == defaultMax)

‎src/DiffEngine/OrderReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static Result ReadToolOrder()
3535
internal static IEnumerable<DiffTool> ParseEnvironment(string diffOrder)
3636
{
3737
foreach (var toolString in diffOrder
38-
.Split(new[] {',', '|', ' '}, StringSplitOptions.RemoveEmptyEntries))
38+
.Split(new[] {',', '|', ' '}, StringSplitOptions.RemoveEmptyEntries))
3939
{
4040
if (!Enum.TryParse<DiffTool>(toolString, out var diffTool))
4141
{

‎src/DiffEngine/Process/LinuxOsxProcess.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static bool TryTerminateProcess(int processId)
1313
FileName = "kill",
1414
Arguments = processId.ToString(),
1515
UseShellExecute = false,
16-
CreateNoWindow = false,
16+
CreateNoWindow = false
1717
}
1818
};
1919
process.Start();
@@ -100,13 +100,19 @@ static bool TryRunPs([NotNullWhen(true)] out string? result)
100100
RedirectStandardOutput = true,
101101
RedirectStandardError = true,
102102
UseShellExecute = false,
103-
CreateNoWindow = false,
103+
CreateNoWindow = false
104104
}
105105
};
106106
process.Start();
107-
process.OutputDataReceived += (_, args) => { outputBuilder.AppendLine(args.Data); };
107+
process.OutputDataReceived += (_, args) =>
108+
{
109+
outputBuilder.AppendLine(args.Data);
110+
};
108111
process.BeginOutputReadLine();
109-
process.ErrorDataReceived += (_, args) => { errorBuilder.AppendLine(args.Data); };
112+
process.ErrorDataReceived += (_, args) =>
113+
{
114+
errorBuilder.AppendLine(args.Data);
115+
};
110116
process.BeginErrorReadLine();
111117
if (!process.DoubleWaitForExit())
112118
{

‎src/DiffEngine/Process/ProcessCleanup.cs

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public static void Kill(string command)
4747
{
4848
command = TrimCommand(command);
4949
}
50+
5051
var matchingCommands = Commands
5152
.Where(x => x.Command == command).ToList();
5253
Logging.Write($"Kill: {command}. Matching count: {matchingCommands.Count}");

‎src/DiffEngine/Tray/JsonEscaping.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ static bool NeedEscape(string src, int i)
44
{
55
var c = src[i];
66
return c < 32 || c is '"' or '\\'
7-
||
8-
IsBrokenLeadSurrogate(src, i, c)
9-
||
10-
IsBrokenTailSurrogate(src, i, c)
11-
||
12-
IsValidJson(c)
13-
||
14-
IsStartOfScriptTag(src, i, c);
7+
||
8+
IsBrokenLeadSurrogate(src, i, c)
9+
||
10+
IsBrokenTailSurrogate(src, i, c)
11+
||
12+
IsValidJson(c)
13+
||
14+
IsStartOfScriptTag(src, i, c);
1515
}
1616

1717
static bool IsValidJson(char c)
@@ -56,6 +56,7 @@ public static string JsonEscape(this string contents)
5656
{
5757
continue;
5858
}
59+
5960
builder.Append(contents, start, i - start);
6061
switch (contents[i])
6162
{

‎src/DiffEngine/WildcardFileFinder.cs

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public static bool TryFind(
8484
result = expanded;
8585
return true;
8686
}
87+
8788
Logging.Write($"Could not find file: {path}");
8889
result = null;
8990
return false;

‎src/DiffEngineTray.Tests/AsyncTimerTests.cs

+9-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ public async Task It_calls_error_callback()
88
var timer = new AsyncTimer(
99
callback: (_, _) => throw new("Simulated!"),
1010
interval: TimeSpan.Zero,
11-
errorCallback: _ => { errorCallbackInvoked.SetResult(true); });
11+
errorCallback: _ =>
12+
{
13+
errorCallbackInvoked.SetResult(true);
14+
});
1215

1316
Assert.True(await errorCallbackInvoked.Task);
1417
}
@@ -34,7 +37,10 @@ public async Task It_continues_to_run_after_an_error()
3437
return Task.FromResult(0);
3538
},
3639
interval: TimeSpan.Zero,
37-
errorCallback: _ => { exceptionThrown = true; });
40+
errorCallback: _ =>
41+
{
42+
exceptionThrown = true;
43+
});
3844

3945
Assert.True(await callbackInvokedAfterError.Task);
4046
}
@@ -96,7 +102,7 @@ public async Task Stop_waits_for_callback_to_complete()
96102
{
97103
var callbackCompleted = new TaskCompletionSource<bool>();
98104
var callbackTaskStarted = new TaskCompletionSource<bool>();
99-
var timer = new AsyncTimer(
105+
var timer = new AsyncTimer(
100106
callback: (_, _) =>
101107
{
102108
callbackTaskStarted.SetResult(true);

‎src/DiffEngineTray.Tests/DiffEngineTray.Tests.csproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<NoWarn>CA1416</NoWarn>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
10-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11-
<PackageReference Include="Verify.WinForms" Version="2.8.0" />
12-
<PackageReference Include="Verify.Xunit" Version="16.3.0" />
13-
<PackageReference Include="Verify.ImageMagick" Version="2.13.1" />
14-
<PackageReference Include="Xunit" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
16-
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all" />
17-
<PackageReference Include="XunitContext" Version="3.2.1" />
18-
<ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj" />
19-
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
8+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
11+
<PackageReference Include="Verify.WinForms" Version="2.8.0"/>
12+
<PackageReference Include="Verify.Xunit" Version="16.3.0"/>
13+
<PackageReference Include="Verify.ImageMagick" Version="2.13.1"/>
14+
<PackageReference Include="Xunit" Version="2.4.1"/>
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all"/>
16+
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all"/>
17+
<PackageReference Include="XunitContext" Version="3.2.1"/>
18+
<ProjectReference Include="..\DiffEngineTray\DiffEngineTray.csproj"/>
19+
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj"/>
2020
</ItemGroup>
2121
</Project>

‎src/DiffEngineTray.Tests/MenuBuilderTest.cs

+39-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
[UsesVerify]
1+
using EmptyFiles;
2+
3+
[UsesVerify]
24
public class MenuBuilderTest :
35
XunitContextBase
46
{
57
[Fact]
68
public async Task Empty()
79
{
810
await using var tracker = new RecordingTracker();
9-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
11+
var menu = MenuBuilder.Build(() =>
12+
{
13+
}, () =>
14+
{
15+
}, tracker);
1016
await Verify(menu, settings);
1117
}
1218

@@ -15,7 +21,11 @@ public async Task OnlyMove()
1521
{
1622
await using var tracker = new RecordingTracker();
1723
tracker.AddMove(file2, file2, "theExe", "theArguments", true, null);
18-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
24+
var menu = MenuBuilder.Build(() =>
25+
{
26+
}, () =>
27+
{
28+
}, tracker);
1929
await Verify(menu, settings);
2030
}
2131

@@ -24,7 +34,11 @@ public async Task OnlyDelete()
2434
{
2535
await using var tracker = new RecordingTracker();
2636
tracker.AddDelete(file1);
27-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
37+
var menu = MenuBuilder.Build(() =>
38+
{
39+
}, () =>
40+
{
41+
}, tracker);
2842
await Verify(menu, settings);
2943
}
3044

@@ -36,20 +50,28 @@ public async Task Full()
3650
tracker.AddDelete(file2);
3751
tracker.AddMove(file3, file3, "theExe", "theArguments", true, null);
3852
tracker.AddMove(file4, file4, "theExe", "theArguments", true, null);
39-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
53+
var menu = MenuBuilder.Build(() =>
54+
{
55+
}, () =>
56+
{
57+
}, tracker);
4058
await Verify(menu, settings);
4159
}
4260

4361
[Fact]
4462
public async Task Many()
4563
{
4664
await using var tracker = new RecordingTracker();
47-
foreach (var file in EmptyFiles.AllFiles.AllPaths)
65+
foreach (var file in AllFiles.AllPaths)
4866
{
4967
tracker.AddDelete(file);
5068
}
5169

52-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
70+
var menu = MenuBuilder.Build(() =>
71+
{
72+
}, () =>
73+
{
74+
}, tracker);
5375
await Verify(menu, settings);
5476
}
5577

@@ -59,7 +81,11 @@ public async Task Grouped()
5981
await using var tracker = new RecordingTracker();
6082
tracker.AddDelete("file2.txt");
6183
tracker.AddMove(file4, "file4.txt", "theExe", "theArguments", true, null);
62-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
84+
var menu = MenuBuilder.Build(() =>
85+
{
86+
}, () =>
87+
{
88+
}, tracker);
6389
await Verify(menu, settings);
6490
}
6591

@@ -71,7 +97,11 @@ public async Task FullGrouped()
7197
tracker.AddDelete("file2.txt");
7298
tracker.AddMove(file3, file3, "theExe", "theArguments", true, null);
7399
tracker.AddMove(file4, "file4.txt", "theExe", "theArguments", true, null);
74-
var menu = MenuBuilder.Build(() => { }, () => { }, tracker);
100+
var menu = MenuBuilder.Build(() =>
101+
{
102+
}, () =>
103+
{
104+
}, tracker);
75105
await Verify(menu, settings);
76106
}
77107

‎src/DiffEngineTray.Tests/RecordingTracker.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
Tracker
33
{
44
public RecordingTracker() :
5-
base(() => {}, () => {})
5+
base(() =>
6+
{
7+
}, () =>
8+
{
9+
})
610
{
711
}
812

0 commit comments

Comments
 (0)