_zed macos final
Some checks failed
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Cooker / Cook (Mac) (push) Has been cancelled
Tests / Tests (Linux) (push) Has been cancelled
Tests / Tests (Windows) (push) Has been cancelled
Some checks failed
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Cooker / Cook (Mac) (push) Has been cancelled
Tests / Tests (Linux) (push) Has been cancelled
Tests / Tests (Windows) (push) Has been cancelled
This commit is contained in:
@@ -87,6 +87,15 @@ void ZedEditor::FindEditors(Array<CodeEditor*>* output)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#elif PLATFORM_MAC
|
#elif PLATFORM_MAC
|
||||||
|
// Prefer the Zed CLI application over bundled app, as this handles opening files in existing instance better.
|
||||||
|
// The bundle also contains the CLI application under Zed.app/Contents/MacOS/zed, but using this doesn't make any difference.
|
||||||
|
const String cliPath(TEXT("/usr/local/bin/zed"));
|
||||||
|
if (FileSystem::FileExists(cliPath))
|
||||||
|
{
|
||||||
|
output->Add(New<ZedEditor>(cliPath));
|
||||||
|
return;;
|
||||||
|
}
|
||||||
|
|
||||||
// System installed app
|
// System installed app
|
||||||
NSURL* AppURL = [[NSWorkspace sharedWorkspace]URLForApplicationWithBundleIdentifier:@"dev.zed.Zed"];
|
NSURL* AppURL = [[NSWorkspace sharedWorkspace]URLForApplicationWithBundleIdentifier:@"dev.zed.Zed"];
|
||||||
if (AppURL != nullptr)
|
if (AppURL != nullptr)
|
||||||
|
|||||||
Reference in New Issue
Block a user