zyedidia/micro
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2025-06-18 23:05:40 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

config/settings: Remove duplicating DefaultGlobalSettings()

Browse Source 
Additionally pricise the documentation of the remaining
DefaultCommonSettings() and DefaultAllSettings() functions.
This commit is contained in:
Jöran Karl 2024-08-11 16:12:09 +02:00
parent 4663927098
commit f661b64e0a
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/config/settings.go
View File

@ -273,7 +273,7 @@ func verifySetting(option string, value interface{}, def interface{}) error {
// Must be called after ReadSettings // Must be called after ReadSettings
func InitGlobalSettings() error { func InitGlobalSettings() error {
var err error var err error
GlobalSettings = DefaultGlobalSettings() GlobalSettings = DefaultAllSettings()
for k, v := range parsedSettings { for k, v := range parsedSettings {
if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") { if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
@ -319,7 +319,7 @@ func WriteSettings(filename string) error {
var err error var err error
if _, e := os.Stat(ConfigDir); e == nil { if _, e := os.Stat(ConfigDir); e == nil {
defaults := DefaultGlobalSettings() defaults := DefaultAllSettings()
// remove any options froms parsedSettings that have since been marked as default // remove any options froms parsedSettings that have since been marked as default
for k, v := range parsedSettings { for k, v := range parsedSettings {
@ -354,7 +354,7 @@ func OverwriteSettings(filename string) error {
var err error var err error
if _, e := os.Stat(ConfigDir); e == nil { if _, e := os.Stat(ConfigDir); e == nil {
defaults := DefaultGlobalSettings() defaults := DefaultAllSettings()
for k, v := range GlobalSettings { for k, v := range GlobalSettings {
if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) { if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
if _, wr := ModifiedSettings[k]; wr { if _, wr := ModifiedSettings[k]; wr {
@ -420,8 +420,8 @@ func GetInfoBarOffset() int {
return offset return offset
} }
// DefaultCommonSettings returns the default global settings for micro // DefaultCommonSettings returns a map of all common buffer settings
// Note that colorscheme is a global only option // and their default values
func DefaultCommonSettings() map[string]interface{} { func DefaultCommonSettings() map[string]interface{} {
commonsettings := make(map[string]interface{}) commonsettings := make(map[string]interface{})
for k, v := range defaultCommonSettings { for k, v := range defaultCommonSettings {
@ -430,21 +430,8 @@ func DefaultCommonSettings() map[string]interface{} {
return commonsettings return commonsettings
} }
// DefaultGlobalSettings returns the default global settings for micro // DefaultAllSettings returns a map of all common buffer & global-only settings
// Note that colorscheme is a global only option // and their default values
func DefaultGlobalSettings() map[string]interface{} {
globalsettings := make(map[string]interface{})
for k, v := range defaultCommonSettings {
globalsettings[k] = v
}
for k, v := range DefaultGlobalOnlySettings {
globalsettings[k] = v
}
return globalsettings
}
// DefaultAllSettings returns a map of all settings and their
// default values (both common and global settings)
func DefaultAllSettings() map[string]interface{} { func DefaultAllSettings() map[string]interface{} {
allsettings := make(map[string]interface{}) allsettings := make(map[string]interface{})
for k, v := range defaultCommonSettings { for k, v := range defaultCommonSettings {