GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_macos?

Browse Source
This commit is contained in:
Ari Vuollet
2025-10-29 20:43:50 +02:00
parent 269e8963e8
commit 7bdc08f8be
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Editor/Scripting/CodeEditors/ZedEditor.cpp
View File

@@ -51,7 +51,7 @@ void ZedEditor::FindEditors(Array<CodeEditor*>* output)
}
#elif PLATFORM_LINUX
char buffer[128];
FILE* pipe = popen("/bin/bash -c \"type -p code\"", "r");
FILE* pipe = popen("/bin/bash -c \"type -p zed\"", "r");
if (pipe)
{
StringAnsi pathAnsi;
@@ -66,7 +66,7 @@ void ZedEditor::FindEditors(Array<CodeEditor*>* output)
}
}
{
const String path(TEXT("/usr/bin/code"));
const String path(TEXT("/usr/bin/zed"));
if (FileSystem::FileExists(path))
{
output->Add(New<VisualStudioCodeEditor>(path, false));
@@ -77,22 +77,22 @@ void ZedEditor::FindEditors(Array<CodeEditor*>* output)
// Detect Flatpak installations
{
CreateProcessSettings procSettings;
procSettings.FileName = TEXT("/bin/bash -c \"flatpak list --app --columns=application | grep com.visualstudio.code -c\"");
procSettings.FileName = TEXT("/bin/bash -c \"flatpak list --app --columns=application | grep dev.zed.Zed -c\"");
procSettings.HiddenWindow = true;
if (Platform::CreateProcess(procSettings) == 0)
{
const String runPath(TEXT("flatpak run com.visualstudio.code"));
output->Add(New<VisualStudioCodeEditor>(runPath, false));
const String runPath(TEXT("flatpak run dev.zed.Zed"));
output->Add(New<VisualStudioCodeEditor>(runPath));
return;
}
}
#elif PLATFORM_MAC
// System installed app
NSURL* AppURL = [[NSWorkspace sharedWorkspace]URLForApplicationWithBundleIdentifier:@"com.microsoft.VSCode"];
NSURL* AppURL = [[NSWorkspace sharedWorkspace]URLForApplicationWithBundleIdentifier:@"dev.zed.Zed"];
if (AppURL != nullptr)
{
const String path = AppleUtils::ToString((CFStringRef)[AppURL path]);
output->Add(New<VisualStudioCodeEditor>(path, false));
output->Add(New<ZedEditor>(path));
return;
}
@@ -101,15 +101,15 @@ void ZedEditor::FindEditors(Array<CodeEditor*>* output)
FileSystem::GetSpecialFolderPath(SpecialFolder::Documents, userFolder);
String paths[3] =
{
TEXT("/Applications/Visual Studio Code.app"),
userFolder + TEXT("/../Visual Studio Code.app"),
userFolder + TEXT("/../Downloads/Visual Studio Code.app"),
TEXT("/Applications/Zed.app"),
userFolder + TEXT("/../Zed.app"),
userFolder + TEXT("/../Downloads/Zed.app"),
};
for (const String& path : paths)
{
if (FileSystem::DirectoryExists(path))
{
output->Add(New<VisualStudioCodeEditor>(path, false));
output->Add(New<ZedEditor>(path));
break;
}
}