simplify API of utils.Once

This commit is contained in:
Kovid Goyal
2023-05-26 22:42:07 +05:30
parent d89c1426d5
commit e59e42a6c2
17 changed files with 59 additions and 55 deletions

View File

@@ -22,7 +22,7 @@ var _ = fmt.Print
var _ = os.WriteFile
var ErrNoLexer = errors.New("No lexer available for this format")
var DefaultStyle = (&utils.Once[*chroma.Style]{Run: func() *chroma.Style {
var DefaultStyle = utils.Once(func() *chroma.Style {
// Default style generated by python style.py default pygments.styles.default.DefaultStyle
// with https://raw.githubusercontent.com/alecthomas/chroma/master/_tools/style.py
return styles.Register(chroma.MustNewStyle("default", chroma.StyleEntries{
@@ -67,7 +67,7 @@ var DefaultStyle = (&utils.Once[*chroma.Style]{Run: func() *chroma.Style {
chroma.Error: "border:#FF0000",
chroma.Background: " bg:#f8f8f8",
}))
}}).Get
})
// Clear the background colour.
func clear_background(style *chroma.Style) *chroma.Style {

View File

@@ -42,9 +42,9 @@ func read_relevant_kitty_opts(path string) KittyOpts {
return ans
}
var RelevantKittyOpts = (&utils.Once[KittyOpts]{Run: func() KittyOpts {
var RelevantKittyOpts = utils.Once(func() KittyOpts {
return read_relevant_kitty_opts(filepath.Join(utils.ConfigDir(), "kitty.conf"))
}}).Get
})
func (self *Handler) handle_wheel_event(up bool) {
amt := RelevantKittyOpts().Wheel_scroll_multiplier

View File

@@ -22,13 +22,13 @@ const DIFF_DIFF = `diff -p -U _CONTEXT_ --`
var diff_cmd []string
var GitExe = (&utils.Once[string]{Run: func() string {
var GitExe = utils.Once(func() string {
return utils.FindExe("git")
}}).Get
})
var DiffExe = (&utils.Once[string]{Run: func() string {
var DiffExe = utils.Once(func() string {
return utils.FindExe("diff")
}}).Get
})
func find_differ() {
if GitExe() != "git" && exec.Command(GitExe(), "--help").Run() == nil {