diff options
author | supatier <atisuperati@gmail.com> | 2019-01-01 06:31:34 +0700 |
---|---|---|
committer | supatier <atisuperati@gmail.com> | 2019-01-02 05:40:34 +0700 |
commit | ab7f102b145a04c6d21387124984cb14086a314e (patch) | |
tree | f6d4175ee6e5a456d81b9988c8582a0f057e85f0 /modules | |
parent | 89560c2138d00c6b64f09dda97a18cb84ab76aff (diff) |
Add code-oss, vscode-oss, and visual-studio-code-oss to vscode path
Diffstat (limited to 'modules')
-rw-r--r-- | modules/mono/editor/godotsharp_editor.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index a1f4bb3c4c..637b6ae985 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -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"); - } - 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"); + 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; + } } List<String> args; |