Skip to content

Tidy two pieces of definition data #811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonCropp merged 1 commit into from
Aug 22, 2026
Merged

Tidy two pieces of definition data #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/diff-tool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Use shell execute: True
* Create no window: False
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
* 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, .webp, .wim, .xlsx, .xz, .zip, .zipx
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tgz, .tif, .tiff, .war, .webp, .wim, .xlsx, .xz, .zip, .zipx

#### Tool order:

Expand Down Expand Up @@ -664,7 +664,9 @@ DiffTools.UseOrder(DiffTool.Neovim);
-d "tempFile.txt" "targetFile.txt"
```
* Scanned paths:
* `C:\Program Files\Neovim\binnvim.exe`
* `%ProgramFiles%\Neovim\bin\nvim.exe`
* `%ProgramW6432%\Neovim\bin\nvim.exe`
* `%ProgramFiles(x86)%\Neovim\bin\nvim.exe`
* `%PATH%nvim.exe`

#### OSX settings:
Expand Down
6 changes: 4 additions & 2 deletions src/DiffEngine.Tests/diffTools.include.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Use shell execute: True
* Create no window: False
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
* 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, .webp, .wim, .xlsx, .xz, .zip, .zipx
* Supported binaries: .7z, .bcpkg, .bin, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tgz, .tif, .tiff, .war, .webp, .wim, .xlsx, .xz, .zip, .zipx

#### Tool order:

Expand Down Expand Up @@ -529,7 +529,9 @@ DiffTools.UseOrder(DiffTool.Neovim);
-d "tempFile.txt" "targetFile.txt"
```
* Scanned paths:
* `C:\Program Files\Neovim\binnvim.exe`
* `%ProgramFiles%\Neovim\bin\nvim.exe`
* `%ProgramW6432%\Neovim\bin\nvim.exe`
* `%ProgramFiles(x86)%\Neovim\bin\nvim.exe`
* `%PATH%nvim.exe`

#### OSX settings:
Expand Down
2 changes: 0 additions & 2 deletions src/DiffEngine/Implementation/BeyondCompare.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ static string RightOsxLinuxArguments(string temp, string target) =>
".bz2",
".tbz",
".tbz2",
".tbz2",
".chm",
".deb",
".img",
".iso",
".iso",
".gz",
".tgz",
".cab",
Expand Down
5 changes: 4 additions & 1 deletion src/DiffEngine/Implementation/Neovim.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ public static Definition Neovim()
Windows: new(
"nvim.exe",
launchArguments,
searchDirectory: @"C:\Program Files\Neovim\bin"),
// %ProgramFiles%, not the literal path: expansion is what picks up
// ProgramW6432 and the x86 variant, and what makes this work on a
// machine whose Windows is not on C:
searchDirectory: @"%ProgramFiles%\Neovim\bin\"),
Linux: new(
"nvim",
launchArguments),
Expand Down
Loading