mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-09-05 19:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: use file parent dir for openTerminal service cwd (#7286) (#7292)

Browse Source 
Fixes #7286

Previously, when using the "New Ghostty Window/Tab Here" macOS service
on a file, the new terminal window/tab would incorrectly open in the
user's home directory. This was because the service handler only
expected directory paths.

This commit updates the service handler to check if the provided path is
a file. If it is, the handler now uses the file's parent
directory as the working directory for the new Ghostty window or tab,
aligning with user expectations. If the path is a directory, it's used
directly as before.
This commit is contained in:
Mitchell Hashimoto
2025-05-15 20:20:59 -07:00
committed by GitHub
parent 2d29fe0494 800054874e
commit a6466c5ca0
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
macos/Sources/Features/Services/ServiceProvider.swift
View File

@@ -36,25 +36,27 @@ class ServiceProvider: NSObject {
error.pointee = Self.errorNoString
return
}
let filePaths = objs.map { $0.path }.compactMap { $0 }
let urlObjects = objs.map { $0 as URL }
openTerminal(filePaths, target: target)
openTerminal(urlObjects, target: target)
}
private func openTerminal(_ paths: [String], target: OpenTarget) {
private func openTerminal(_ urls: [URL], target: OpenTarget) {
guard let delegateRaw = NSApp.delegate else { return }
guard let delegate = delegateRaw as? AppDelegate else { return }
let terminalManager = delegate.terminalManager
for path in paths {
// We only open in directories.
var isDirectory = ObjCBool(true)
guard FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory) else { continue }
guard isDirectory.boolValue else { continue }
let uniqueCwds: Set<URL> = Set(
urls.map { url -> URL in
// We only open in directories.
url.hasDirectoryPath ? url : url.deletingLastPathComponent()
}
)
for cwd in uniqueCwds {
// Build our config
var config = Ghostty.SurfaceConfiguration()
config.workingDirectory = path
config.workingDirectory = cwd.path(percentEncoded: false)
switch (target) {
case .window: