From 12398916c790cf07efa570c63f74230f5ecc25ea Mon Sep 17 00:00:00 2001 From: Dmitry Maluka Date: Fri, 3 Nov 2023 00:58:30 +0100 Subject: [PATCH] Fix code duplication in RegisterCommonOptionPlug Avoid code duplication between RegisterCommonOption() and RegisterCommonOptionPlug(), exactly the same way as it is done for RegisterGlobalOption() and RegisterGlobalOptionPlug(). --- internal/config/settings.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/internal/config/settings.go b/internal/config/settings.go index af472651..eb377d11 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -218,18 +218,7 @@ func OverwriteSettings(filename string) error { // RegisterCommonOptionPlug creates a new option (called pl.name). This is meant to be called by plugins to add options. func RegisterCommonOptionPlug(pl string, name string, defaultvalue interface{}) error { - name = pl + "." + name - if _, ok := GlobalSettings[name]; !ok { - defaultCommonSettings[name] = defaultvalue - GlobalSettings[name] = defaultvalue - err := WriteSettings(filepath.Join(ConfigDir, "settings.json")) - if err != nil { - return errors.New("Error writing settings.json file: " + err.Error()) - } - } else { - defaultCommonSettings[name] = defaultvalue - } - return nil + return RegisterCommonOption(pl+"."+name, defaultvalue) } // RegisterGlobalOptionPlug creates a new global-only option (named pl.name)