Skip to content

Commit f661b64

Browse files
committed
config/settings: Remove duplicating DefaultGlobalSettings()
Additionally pricise the documentation of the remaining DefaultCommonSettings() and DefaultAllSettings() functions.
1 parent 4663927 commit f661b64

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

internal/config/settings.go

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func verifySetting(option string, value interface{}, def interface{}) error {
273273
// Must be called after ReadSettings
274274
func InitGlobalSettings() error {
275275
var err error
276-
GlobalSettings = DefaultGlobalSettings()
276+
GlobalSettings = DefaultAllSettings()
277277

278278
for k, v := range parsedSettings {
279279
if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
@@ -319,7 +319,7 @@ func WriteSettings(filename string) error {
319319

320320
var err error
321321
if _, e := os.Stat(ConfigDir); e == nil {
322-
defaults := DefaultGlobalSettings()
322+
defaults := DefaultAllSettings()
323323

324324
// remove any options froms parsedSettings that have since been marked as default
325325
for k, v := range parsedSettings {
@@ -354,7 +354,7 @@ func OverwriteSettings(filename string) error {
354354

355355
var err error
356356
if _, e := os.Stat(ConfigDir); e == nil {
357-
defaults := DefaultGlobalSettings()
357+
defaults := DefaultAllSettings()
358358
for k, v := range GlobalSettings {
359359
if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
360360
if _, wr := ModifiedSettings[k]; wr {
@@ -420,8 +420,8 @@ func GetInfoBarOffset() int {
420420
return offset
421421
}
422422

423-
// DefaultCommonSettings returns the default global settings for micro
424-
// Note that colorscheme is a global only option
423+
// DefaultCommonSettings returns a map of all common buffer settings
424+
// and their default values
425425
func DefaultCommonSettings() map[string]interface{} {
426426
commonsettings := make(map[string]interface{})
427427
for k, v := range defaultCommonSettings {
@@ -430,21 +430,8 @@ func DefaultCommonSettings() map[string]interface{} {
430430
return commonsettings
431431
}
432432

433-
// DefaultGlobalSettings returns the default global settings for micro
434-
// Note that colorscheme is a global only option
435-
func DefaultGlobalSettings() map[string]interface{} {
436-
globalsettings := make(map[string]interface{})
437-
for k, v := range defaultCommonSettings {
438-
globalsettings[k] = v
439-
}
440-
for k, v := range DefaultGlobalOnlySettings {
441-
globalsettings[k] = v
442-
}
443-
return globalsettings
444-
}
445-
446-
// DefaultAllSettings returns a map of all settings and their
447-
// default values (both common and global settings)
433+
// DefaultAllSettings returns a map of all common buffer & global-only settings
434+
// and their default values
448435
func DefaultAllSettings() map[string]interface{} {
449436
allsettings := make(map[string]interface{})
450437
for k, v := range defaultCommonSettings {

0 commit comments

Comments
 (0)