Skip to content

Commit cbd6127

Browse files
authored
extra VS scan paths (#6)
1 parent 072ead0 commit cbd6127

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

docs/diff-tool.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ This behavior is currently supported on Windows. On Linux and OSX, tool instance
376376
* Example arguments: `/diff "targetFile" "tempFile"`
377377
* Scanned paths:
378378

379+
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe`
379380
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe`
380381
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.exe`
381382
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe`
@@ -395,7 +396,10 @@ This behavior is currently supported on Windows. On Linux and OSX, tool instance
395396

396397

397398
* Example arguments: `--diff "targetFile" "tempFile"`
398-
* Scanned path: `%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe`
399+
* Scanned paths:
400+
401+
* `%LocalAppData%\Programs\Microsoft VS Code\code.exe`
402+
* `%ProgramFiles%\Microsoft VS Code\bin\code`
399403

400404
### OSX settings:
401405

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@
299299
* Example arguments: `/diff "targetFile" "tempFile"`
300300
* Scanned paths:
301301

302+
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe`
302303
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe`
303304
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.exe`
304305
* `%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe`
@@ -318,7 +319,10 @@
318319

319320

320321
* Example arguments: `--diff "targetFile" "tempFile"`
321-
* Scanned path: `%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe`
322+
* Scanned paths:
323+
324+
* `%LocalAppData%\Programs\Microsoft VS Code\code.exe`
325+
* `%ProgramFiles%\Microsoft VS Code\bin\code`
322326

323327
### OSX settings:
324328

src/DiffEngine/Implementation/VisualStudio.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public static ToolDefinition VisualStudio() =>
1414
buildArguments: (tempFile, targetFile) => $"/diff \"{targetFile}\" \"{tempFile}\"",
1515
windowsExePaths: new[]
1616
{
17+
@"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe",
1718
@"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe",
1819
@"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.exe",
1920
@"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe",

src/DiffEngine/Implementation/VsCode.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public static ToolDefinition VsCode() =>
1414
buildArguments: (tempFile, targetFile) => $"--diff \"{targetFile}\" \"{tempFile}\"",
1515
windowsExePaths: new[]
1616
{
17-
@"%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe"
17+
@"%LocalAppData%\Programs\Microsoft VS Code\code.exe",
18+
@"%ProgramFiles%\Microsoft VS Code\bin\code"
1819
},
1920
binaryExtensions: Array.Empty<string>(),
2021
linuxExePaths: new[]

0 commit comments

Comments
 (0)