Rename symbol function

Author: Soft

.tokeignore

@@ -1,2 +1,2 @@
 assets/glyphnames.json
-internal/symbols/map.go
+internal/integrations/nerdfonts/symbols.go

cmd/mkprompt/symbols.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"slices"
 
-	"github.com/Soft/mkprompt/internal/symbols"
+	"github.com/Soft/mkprompt/internal/integrations/nerdfonts"
 )
 
 type Symbol struct {
@@ -13,8 +13,8 @@ type Symbol struct {
 }
 
 func listSymbols() {
-	symbolList := make([]Symbol, 0, len(symbols.SymbolMap))
-	for name, code := range symbols.SymbolMap {
+	symbolList := make([]Symbol, 0, len(nerdfonts.SymbolMap))
+	for name, code := range nerdfonts.SymbolMap {
 		symbolList = append(symbolList, Symbol{
 			Name: name,
 			Code: code,

examples/fancy.json

@@ -52,7 +52,7 @@
               "call": "concat",
               "strings": [
                 " ",
-                { "call": "symbol", "name": "dev-linux" },
+                { "call": "nerd_fonts", "symbol": "dev-linux" },
                 " ",
                 { "call": "username" },
                 " "
@@ -65,7 +65,7 @@
               "call": "concat",
               "strings": [
                 " ",
-                { "call": "symbol", "name": "oct-server" },
+                { "call": "nerd_fonts", "symbol": "oct-server" },
                 "  ",
                 { "call": "hostname" },
                 " "
@@ -83,7 +83,7 @@
                 "call": "concat",
                 "strings": [
                   " ",
-                  { "call": "symbol", "name": "dev-git_branch" },
+                  { "call": "nerd_fonts", "symbol": "dev-git_branch" },
                   " ",
                   { "ref": "git_branch" },
                   " "
@@ -115,7 +115,7 @@
                   "call": "concat",
                   "strings": [
                     " ",
-                    { "call": "symbol", "name": "dev-python" },
+                    { "call": "nerd_fonts", "symbol": "dev-python" },
                     " ",
                     {
                       "call": "lookup",
@@ -145,7 +145,7 @@
                 "call": "concat",
                 "strings": [
                   " ",
-                  { "call": "symbol", "name": "fa-warning" },
+                  { "call": "nerd_fonts", "symbol": "fa-warning" },
                   " "
                 ]
               }
@@ -227,8 +227,8 @@
                   "content": {
                     "call": "text",
                     "content": {
-                      "call": "symbol",
-                      "name": "ple-left_half_circle_thick"
+                      "call": "nerd_fonts",
+                      "symbol": "ple-left_half_circle_thick"
                     }
                   }
                 },
@@ -248,8 +248,8 @@
                   "content": {
                     "call": "text",
                     "content": {
-                      "call": "symbol",
-                      "name": "ple-right_half_circle_thick"
+                      "call": "nerd_fonts",
+                      "symbol": "ple-right_half_circle_thick"
                     }
                   }
                 },
@@ -260,8 +260,8 @@
                   "content": {
                     "call": "text",
                     "content": {
-                      "call": "symbol",
-                      "name": "pl-left_hard_divider"
+                      "call": "nerd_fonts",
+                      "symbol": "pl-left_hard_divider"
                     }
                   }
                 }

internal/builtins/builtins.go

@@ -40,9 +40,6 @@ var Builtins = []*Builtin{
 	&SplitCount,
 	&ToString,
 
-	// Symbol functions
-	&Symbol,
-
 	// List functions
 	&Length,
 	&Empty,
@@ -105,6 +102,9 @@ var Builtins = []*Builtin{
 	// Python functions
 	&PythonVirtualEnvStatus,
 
+	// Nerd Font functions
+	&NerdFonts,
+
 	// Environment functions
 	&Environment,
 

internal/builtins/nerdfonts.go

@@ -0,0 +1,36 @@
+package builtins
+
+import (
+	"fmt"
+
+	"github.com/Soft/mkprompt/internal/eval"
+	"github.com/Soft/mkprompt/internal/integrations/nerdfonts"
+)
+
+func nerdFontsFunction(args map[string]eval.Value) (value eval.Value, err error) {
+	nameValue := args["symbol"]
+
+	var name eval.String
+	if name, err = eval.AsString(nameValue); err != nil {
+		return
+	}
+
+	var symbolRune rune
+	var ok bool
+	if symbolRune, ok = nerdfonts.SymbolMap[name.Value]; !ok {
+		err = fmt.Errorf("unknown symbol %q", name.Value)
+		return
+	}
+
+	value = eval.String{Value: string(symbolRune)}
+	return
+}
+
+var NerdFonts = Builtin{
+	Name:        "nerd_fonts",
+	Description: "Return the specified Nerd Fonts symbol.",
+	Function: eval.BuiltinFunction{
+		Parameters: []eval.ParameterSpec{{Name: "symbol"}},
+		Function:   nerdFontsFunction,
+	},
+}

internal/builtins/symbol.go

@@ -0,0 +1,3 @@
+package nerdfonts
+
+//go:generate go run ../../build/cmd/gensymbols/main.go nerdfonts ../../../assets/glyphnames.json symbols.go