aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-10-16 01:35:11 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-10-16 01:35:11 -0700
commitf451d95a39a6f5de31068e2499e30ef90430b28d (patch)
tree6f1fc0c833a2271693fbf4e667669bc760b26ea1
parentfaf7c2db7d154e113a65fc0efa3e4266680ed0c4 (diff)
downloadvcpkg-f451d95a39a6f5de31068e2499e30ef90430b28d.tar.gz
vcpkg-f451d95a39a6f5de31068e2499e30ef90430b28d.zip
[vcpkg] Fix blocking on `vcpkg edit` with VSCode
-rw-r--r--toolsrc/src/vcpkg/commands.edit.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 0b1b348c2..237feebdd 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -155,6 +155,16 @@ namespace vcpkg::Commands::Edit
const std::vector<std::string> arguments = create_editor_arguments(paths, options, ports);
const auto args_as_string = Strings::join(" ", arguments);
const auto cmd_line = Strings::format(R"("%s" %s -n)", env_editor.u8string(), args_as_string);
+
+ auto editor_exe = env_editor.filename().u8string();
+
+#ifdef _WIN32
+ if (editor_exe == "Code.exe" || editor_exe == "Code - Insiders.exe")
+ {
+ System::cmd_execute_no_wait(cmd_line + " <NUL");
+ Checks::exit_success(VCPKG_LINE_INFO);
+ }
+#endif
Checks::exit_with_code(VCPKG_LINE_INFO, System::cmd_execute(cmd_line));
}
}