Merge pull request #3174 from carapace-sh/ghostty-font-family

ghostty: use font families provided by ghostty

Author: rsteube

completers/common/ghostty_completer/cmd/listFonts.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace-bin/pkg/actions/os"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/ghostty"
 	"github.com/spf13/cobra"
 )
 
@@ -22,6 +22,6 @@ func init() {
 	rootCmd.AddCommand(listFontsCmd)
 
 	carapace.Gen(listFontsCmd).FlagCompletion(carapace.ActionMap{
-		"family": os.ActionFontFamilies(),
+		"family": ghostty.ActionFontFamilies(),
 	})
 }

completers/common/ghostty_completer/cmd/root.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bin/pkg/actions/color"
-	"github.com/carapace-sh/carapace-bin/pkg/actions/os"
 	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/ghostty"
 	"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
 	"github.com/carapace-sh/carapace/pkg/style"
@@ -181,13 +180,13 @@ func addConfigs(cmd *cobra.Command) {
 			case 0:
 				return carapace.ActionValues() // TODO codepoint
 			default:
-				return os.ActionFontFamilies()
+				return ghostty.ActionFontFamilies()
 			}
 		}),
-		"font-family":                os.ActionFontFamilies(),
-		"font-family-bold":           os.ActionFontFamilies(),
-		"font-family-bold-italic":    os.ActionFontFamilies(),
-		"font-family-italic":         os.ActionFontFamilies(),
+		"font-family":                ghostty.ActionFontFamilies(),
+		"font-family-bold":           ghostty.ActionFontFamilies(),
+		"font-family-bold-italic":    ghostty.ActionFontFamilies(),
+		"font-family-italic":         ghostty.ActionFontFamilies(),
 		"font-feature":               carapace.ActionValues(), // TODO font-features
 		"font-style":                 carapace.ActionValues(), // TODO font style
 		"font-style-bold":            carapace.ActionValues(), // TODO font style
@@ -232,7 +231,7 @@ func addConfigs(cmd *cobra.Command) {
 		"window-padding-color":        ghostty.ActionWindowPaddingColors(),
 		"window-save-state":           ghostty.ActionWindowSaveStates(),
 		"window-theme":                ghostty.ActionWindowThemes(),
-		"window-title-font-family":    os.ActionFontFamilies(),
+		"window-title-font-family":    ghostty.ActionFontFamilies(),
 		"working-directory":           carapace.ActionDirectories(),
 	})
 }

pkg/actions/tools/ghostty/font.go

@@ -1,6 +1,10 @@
 package ghostty
 
-import "github.com/carapace-sh/carapace"
+import (
+	"strings"
+
+	"github.com/carapace-sh/carapace"
+)
 
 // ActionFontSyntheticStyles completes font synthetic styles
 //
@@ -16,7 +20,7 @@ func ActionFontSyntheticStyles() carapace.Action {
 		"no-bold-italic", "disable for bold-italic",
 		"no-italic", "disable for italic",
 		"true", "completely enable",
-	)
+	).Tag("font synthetic styles")
 }
 
 // ActionFreetypeLoadFlags completes freetype load flags
@@ -33,5 +37,23 @@ func ActionFreetypeLoadFlags() carapace.Action {
 		"no-force-autohint", "Do not se the freetype auto-hinter",
 		"no-monochrome", "Do not use 1-bit monochrome rendering",
 		"no-autohint", "Do not use the freetype auto-hinter",
-	)
+	).Tag("freetype load flags")
+}
+
+// ActionFontFamilies completes font families
+//
+//	FreeMono
+//	FreeSans
+func ActionFontFamilies() carapace.Action {
+	return carapace.ActionExecCommand("ghostty", "+list-fonts")(func(output []byte) carapace.Action {
+		lines := strings.Split(string(output), "\n")
+
+		vals := make([]string, 0)
+		for _, line := range lines {
+			if line != "" && !strings.HasPrefix(line, " ") {
+				vals = append(vals, line)
+			}
+		}
+		return carapace.ActionValues(vals...)
+	}).Tag("font families")
 }