asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24688 from Supatier/add-additional-vscode-name

Browse source 
Add code-oss, vscode-oss, and visual-studio-code-oss to vscode path
This commit is contained in:
Rémi Verschelde 2019-01-03 21:32:41 +01:00 committed by GitHub
commit 1808241d16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/mono/editor/godotsharp_editor.cpp
View file

@ -248,16 +248,19 @@ Error GodotSharpEditor::open_in_external_editor(const Ref<Script> &p_script, int
static String vscode_path;
if (vscode_path.empty() || !FileAccess::exists(vscode_path)) {
static List<String> vscode_name;
vscode_name.push_back("code");
vscode_name.push_back("code-oss");
vscode_name.push_back("vscode");
vscode_name.push_back("vscode-oss");
vscode_name.push_back("visual-studio-code");
vscode_name.push_back("visual-studio-code-oss");
// Try to search it again if it wasn't found last time or if it was removed from its location
vscode_path = path_which("code");
for (int i = 0; i < vscode_name.size(); i++) {
vscode_path = path_which(vscode_name[i]);
if (!vscode_path.empty() || FileAccess::exists(vscode_path))
break;
}
if (vscode_path.empty() || !FileAccess::exists(vscode_path)) {
// On some Linux distro the executable has the name vscode
vscode_path = path_which("vscode");
}
if (vscode_path.empty() || !FileAccess::exists(vscode_path)) {
// Executable name when installing VSCode directly from MS on Linux
vscode_path = path_which("visual-studio-code");
}
List<String> args;