Skip to content

Commit 9076d25

Browse files
SimonCroppSimonCropp
committed
.
1 parent cf8ce7a commit 9076d25

File tree

6 files changed

+29
-15
lines changed

6 files changed

+29
-15
lines changed

‎src/DiffEngine.Tests/DiffToolsTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@ static async Task AddToolAndLaunch()
115115

116116
#endregion
117117
}
118+
/**
119+
118120
[Fact]
119121
public Task LaunchSpecificBinaryDiff() =>
120-
DiffRunner.LaunchAsync(DiffTool.ExamDiff,
122+
DiffRunner.LaunchAsync(DiffTool.VisualStudioCode,
121123
Path.Combine(SourceDirectory, "input.temp.bin"),
122124
Path.Combine(SourceDirectory, "input.target.bin"));
123-
/**
124-
125125
[Fact]
126126
public Task LaunchSpecificTextDiff() =>
127127
DiffRunner.LaunchAsync(DiffTool.VisualStudioCode,

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
1212
* Supports text files: True
1313
* Use shell execute: True
1414
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
15-
* Supported binaries: .7z, .bcpkg, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xlsx, .xz, .zip, .zipx
15+
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xlsx, .xz, .zip, .zipx
1616

1717
#### Notes:
1818

1919
* [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
2020
* Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
21-
* For `.kmz`, and `.nupkg`, Beyond Compare needs to be configured to treat them as zip.
21+
* For `.kmz`, and `.nupkg`, Beyond Compare needs to be configured to treat them as zip.
2222
`Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list.
2323

2424
#### Windows settings:
@@ -144,7 +144,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
144144
* Supports text files: True
145145
* Use shell execute: True
146146
* Environment variable for custom install location: `DiffEngine_ExamDiff`
147-
* Supported binaries: .svg
147+
* Supported binaries: .bin, .svg
148148

149149
#### Notes:
150150

@@ -223,7 +223,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
223223
* Supports text files: True
224224
* Use shell execute: True
225225
* Environment variable for custom install location: `DiffEngine_Kaleidoscope`
226-
* Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
226+
* Supported binaries: .bin, .bmp, .gif, .ico, .jpeg, .jpg, .png, .svg, .tif, .tiff
227227

228228
#### OSX settings:
229229

@@ -310,6 +310,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
310310
-d "tempFile.txt" "targetFile.txt"
311311
```
312312
* Scanned paths:
313+
* `C:\Program Files\Neovim\binnvim.exe`
313314
* `%PATH%nvim.exe`
314315

315316
#### OSX settings:
@@ -533,7 +534,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
533534
* Supports text files: True
534535
* Use shell execute: True
535536
* Environment variable for custom install location: `DiffEngine_TortoiseGitMerge`
536-
* Supported binaries: .svg
537+
* Supported binaries: .bin, .svg
537538

538539
#### Windows settings:
539540

@@ -659,7 +660,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
659660
* Supports text files: True
660661
* Use shell execute: True
661662
* Environment variable for custom install location: `DiffEngine_WinMerge`
662-
* 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
663+
* Supported binaries: .bin, .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
663664

664665
#### Notes:
665666

@@ -895,7 +896,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
895896
* Supports text files: True
896897
* Use shell execute: False
897898
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
898-
* Supported binaries: .svg
899+
* Supported binaries: .bin, .svg
899900

900901
#### Notes:
901902

‎src/DiffEngine/Implementation/ExamDiff.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ static string RightArguments(string temp, string target)
2525
UseShellExecute: true,
2626
RequiresTarget: true,
2727
Cost: "Paid",
28-
BinaryExtensions: [".svg"],
28+
BinaryExtensions:
29+
[
30+
".bin",
31+
".svg"
32+
],
2933
OsSupport: new(
3034
Windows: new(
3135
"ExamDiff.exe",

‎src/DiffEngine/Implementation/Neovim.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ public static Definition Neovim()
1919
OsSupport: new(
2020
Windows: new(
2121
"nvim.exe",
22-
launchArguments),
22+
launchArguments,
23+
searchDirectory: @"C:\Program Files\Neovim\bin"),
2324
Linux: new(
2425
"nvim",
2526
launchArguments),

‎src/DiffEngine/Implementation/TortoiseGitMerge.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ public static Definition TortoiseGitMerge() =>
1010
UseShellExecute: true,
1111
RequiresTarget: true,
1212
Cost: "Free",
13-
BinaryExtensions: [".svg"],
13+
BinaryExtensions:
14+
[
15+
".svg",
16+
".bin"
17+
],
1418
OsSupport: new(
1519
Windows: new(
1620
"TortoiseGitMerge.exe",

‎src/DiffEngine/Implementation/VsCode.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ public static Definition VisualStudioCode()
1414
UseShellExecute: false,
1515
RequiresTarget: true,
1616
Cost: "Free",
17-
BinaryExtensions: [".svg"],
17+
BinaryExtensions:
18+
[
19+
".svg",
20+
".bin"
21+
],
1822
OsSupport: new(
1923
Windows: new(
2024
"code.cmd",
@@ -28,6 +32,6 @@ public static Definition VisualStudioCode()
2832
"code",
2933
launchArguments,
3034
"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/")),
31-
Notes: " * [Command line reference](https://code.visualstudio.com/docs/editor/command-line)");
35+
Notes: " * [Command line reference](https://code.visualstudio.com/docs/editor/command-line)");
3236
}
3337
}

0 commit comments

Comments
 (0)