Skip to content

Commit e619690

Browse files
SimonCroppSimonCropp
committed
.
1 parent b511413 commit e619690

32 files changed

+97
-98
lines changed

‎docs/diff-tool.custom.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var resolvedTool = DiffTools.AddTool(
1818
isMdi: false,
1919
supportsText: true,
2020
requiresTarget: true,
21-
createNoWindow: false,
21+
useShellExecute: true,
2222
launchArguments: new(
2323
Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
2424
Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),

‎docs/diff-tool.md‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
145145
* Is MDI: False
146146
* Supports auto-refresh: True
147147
* Supports text files: True
148-
* Create no window: False
148+
* Use shell execute: True
149149
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
150150
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .pdf, .png, .rtf, .svg, .tif, .tiff
151151

@@ -187,7 +187,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
187187
* Is MDI: False
188188
* Supports auto-refresh: True
189189
* Supports text files: True
190-
* Create no window: False
190+
* Use shell execute: True
191191
* Environment variable for custom install location: `DiffEngine_DeltaWalker`
192192
* Supported binaries: .bmp, .bz2, .doc, .docx, .ear, .gif, .gz, .htm, .html, .ico, .j2k, .jar, .jp2, .jpg, .pbm, .pct, .pdf, .pgm, .pic, .pict, .png, .pnm, .ppm, .ppt, .psd, .rtf, .svg, .tar, .tbz2, .tgz, .tif, .xls, .xlsx, .zip
193193

@@ -219,7 +219,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
219219
* Is MDI: False
220220
* Supports auto-refresh: True
221221
* Supports text files: True
222-
* Create no window: False
222+
* Use shell execute: True
223223
* Environment variable for custom install location: `DiffEngine_Diffinity`
224224
* Supported binaries: .svg
225225

@@ -239,7 +239,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
239239
* Is MDI: False
240240
* Supports auto-refresh: True
241241
* Supports text files: True
242-
* Create no window: False
242+
* Use shell execute: True
243243
* Environment variable for custom install location: `DiffEngine_ExamDiff`
244244
* Supported binaries: .svg
245245

@@ -265,7 +265,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
265265
* Is MDI: False
266266
* Supports auto-refresh: False
267267
* Supports text files: True
268-
* Create no window: False
268+
* Use shell execute: True
269269
* Environment variable for custom install location: `DiffEngine_Guiffy`
270270
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .png, .svg, .wbmp
271271

@@ -300,7 +300,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
300300
* Is MDI: False
301301
* Supports auto-refresh: True
302302
* Supports text files: True
303-
* Create no window: False
303+
* Use shell execute: True
304304
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
305305
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
306306

@@ -317,7 +317,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
317317
* Is MDI: False
318318
* Supports auto-refresh: False
319319
* Supports text files: True
320-
* Create no window: False
320+
* Use shell execute: True
321321
* Environment variable for custom install location: `DiffEngine_KDiff3`
322322
* Supported binaries: .svg
323323

@@ -352,7 +352,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
352352
* Is MDI: False
353353
* Supports auto-refresh: False
354354
* Supports text files: True
355-
* Create no window: False
355+
* Use shell execute: True
356356
* Environment variable for custom install location: `DiffEngine_Neovim`
357357
* Supported binaries: .svg
358358

@@ -387,7 +387,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
387387
* Is MDI: False
388388
* Supports auto-refresh: False
389389
* Supports text files: True
390-
* Create no window: False
390+
* Use shell execute: True
391391
* Environment variable for custom install location: `DiffEngine_P4Merge`
392392
* Supported binaries: .bmp, .gif, .jpeg, .jpg, .pbm, .pgm, .png, .ppm, .svg, .tif, .tiff, .xbm, .xpm
393393

@@ -428,7 +428,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
428428
* Is MDI: False
429429
* Supports auto-refresh: True
430430
* Supports text files: True
431-
* Create no window: False
431+
* Use shell execute: True
432432
* Environment variable for custom install location: `DiffEngine_Rider`
433433
* Supported binaries: .svg
434434

@@ -470,7 +470,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
470470
* Is MDI: False
471471
* Supports auto-refresh: False
472472
* Supports text files: True
473-
* Create no window: False
473+
* Use shell execute: True
474474
* Environment variable for custom install location: `DiffEngine_TkDiff`
475475
* Supported binaries: .svg
476476

@@ -488,7 +488,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
488488
* Is MDI: False
489489
* Supports auto-refresh: False
490490
* Supports text files: False
491-
* Create no window: False
491+
* Use shell execute: True
492492
* Environment variable for custom install location: `DiffEngine_TortoiseGitIDiff`
493493
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
494494

@@ -508,7 +508,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
508508
* Is MDI: False
509509
* Supports auto-refresh: False
510510
* Supports text files: True
511-
* Create no window: False
511+
* Use shell execute: True
512512
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
513513
* Supported binaries: .svg
514514

@@ -528,7 +528,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
528528
* Is MDI: False
529529
* Supports auto-refresh: False
530530
* Supports text files: False
531-
* Create no window: False
531+
* Use shell execute: True
532532
* Environment variable for custom install location: `DiffEngine_TortoiseIDiff`
533533
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .tif, .tiff
534534

@@ -548,7 +548,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
548548
* Is MDI: False
549549
* Supports auto-refresh: False
550550
* Supports text files: True
551-
* Create no window: False
551+
* Use shell execute: True
552552
* Environment variable for custom install location: `DiffEngine_TortoiseMerge`
553553
* Supported binaries: .svg
554554

@@ -568,7 +568,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
568568
* Is MDI: False
569569
* Supports auto-refresh: True
570570
* Supports text files: True
571-
* Create no window: False
571+
* Use shell execute: True
572572
* Environment variable for custom install location: `DiffEngine_Vim`
573573
* Supported binaries: .svg
574574

@@ -604,7 +604,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
604604
* Is MDI: False
605605
* Supports auto-refresh: True
606606
* Supports text files: True
607-
* Create no window: False
607+
* Use shell execute: True
608608
* Environment variable for custom install location: `DiffEngine_WinMerge`
609609
* Supported binaries: .bmp, .bw, .cut, .dds, .exr, .g3, .gif, .hdp, .hdr, .ico, .iff, .j2c, .j2k, .jif, .jng, .jp2, .jpe, .jpeg, .jpg, .jxr, .koa, .lbm, .mng, .pbm, .pcd, .pct, .pcx, .pfm, .pgm, .pic, .pict, .png, .ppm, .psd, .ras, .rgb, .rgba, .sgi, .svg, .targa, .tga, .tif, .tiff, .wap, .wbm, .wbmp, .wdp, .webp, .xbm, .xpm
610610

@@ -637,7 +637,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
637637
* Is MDI: True
638638
* Supports auto-refresh: True
639639
* Supports text files: True
640-
* Create no window: False
640+
* Use shell execute: True
641641
* Environment variable for custom install location: `DiffEngine_AraxisMerge`
642642
* Supported binaries: .bmp, .dib, .emf, .gif, .j2c, .j2k, .jif, .jp2, .jpc, .jpeg, .jpg, .jpx, .pbm, .pcx, .pgm, .png, .ppm, .ras, .svg, .tga, .tif, .tiff, .wmf
643643

@@ -672,7 +672,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
672672
* Is MDI: True
673673
* Supports auto-refresh: False
674674
* Supports text files: True
675-
* Create no window: False
675+
* Use shell execute: True
676676
* Environment variable for custom install location: `DiffEngine_Meld`
677677
* Supported binaries: .svg
678678

@@ -712,7 +712,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
712712
* Is MDI: True
713713
* Supports auto-refresh: False
714714
* Supports text files: True
715-
* Create no window: False
715+
* Use shell execute: True
716716
* Environment variable for custom install location: `DiffEngine_SublimeMerge`
717717
* Supported binaries: .svg
718718

@@ -751,7 +751,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
751751
* Is MDI: True
752752
* Supports auto-refresh: True
753753
* Supports text files: True
754-
* Create no window: False
754+
* Use shell execute: True
755755
* Environment variable for custom install location: `DiffEngine_VisualStudio`
756756
* Supported binaries: .svg
757757

@@ -780,7 +780,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
780780
* Is MDI: True
781781
* Supports auto-refresh: True
782782
* Supports text files: True
783-
* Create no window: False
783+
* Use shell execute: True
784784
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
785785
* Supported binaries: .svg
786786

‎src/DiffEngine.Tests/DefinitionsTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ public void WriteList()
1717
[Fact]
1818
public void EnvironmentVariablesShouldBeUnique()
1919
{
20-
static void FindDuplicates(Func<OsSupport, OsSettings?> SelectOs)
20+
static void FindDuplicates(Func<OsSupport, OsSettings?> selectOs)
2121
{
2222
var findDuplicates = Definitions.Tools
23-
.Select(d => d.OsSupport)
24-
.Select(SelectOs)
25-
.Where(s => s is not null)
23+
.Select(_ => _.OsSupport)
24+
.Select(selectOs)
25+
.Where(_ => _ is not null)
2626
.GroupBy(_ => _);
2727
foreach (var group in findDuplicates)
2828
{
2929
Assert.Single(group);
3030
}
3131
}
3232

33-
FindDuplicates(os => os.Windows);
34-
FindDuplicates(os => os.Osx);
35-
FindDuplicates(os => os.Linux);
33+
FindDuplicates(_ => _.Windows);
34+
FindDuplicates(_ => _.Osx);
35+
FindDuplicates(_ => _.Linux);
3636
}
3737

3838
static void AddToolLink(TextWriter writer, Definition tool)
@@ -124,7 +124,7 @@ static void AddTool(StreamWriter writer, Definition tool)
124124
* Is MDI: {tool.IsMdi}
125125
* Supports auto-refresh: {tool.AutoRefresh}
126126
* Supports text files: {tool.SupportsText}
127-
* Create no window: {tool.CreateNoWindow}
127+
* Use shell execute: {tool.UseShellExecute}
128128
* Environment variable for custom install location: `DiffEngine_{tool.Tool}`
129129
""");
130130

‎src/DiffEngine.Tests/DiffRunnerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static DiffRunnerTests() =>
187187
autoRefresh: true,
188188
isMdi: false,
189189
supportsText: true,
190-
createNoWindow: false,
190+
useShellExecute: true,
191191
requiresTarget: true,
192192
launchArguments: new(
193193
Left: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\"",

‎src/DiffEngine.Tests/DiffToolsTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void AddTool()
2020
isMdi: false,
2121
supportsText: true,
2222
requiresTarget: true,
23-
createNoWindow: false,
23+
useShellExecute: true,
2424
launchArguments: new(
2525
Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
2626
Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),
@@ -45,7 +45,7 @@ public void OrderShouldNotMessWithAddTool()
4545
isMdi: false,
4646
supportsText: true,
4747
requiresTarget: true,
48-
createNoWindow: false,
48+
useShellExecute: true,
4949
launchArguments: new(
5050
Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
5151
Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),
@@ -67,7 +67,7 @@ public void TextConvention()
6767
isMdi: false,
6868
supportsText: true,
6969
requiresTarget: true,
70-
createNoWindow: false,
70+
useShellExecute: true,
7171
launchArguments: new(
7272
Left: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
7373
Right: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\""),

0 commit comments

Comments
 (0)