Skip to content

Commit 3328bac

Browse files
committed
refactor: clarify code in setup function
1 parent f460728 commit 3328bac

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

lua/neo-tree.lua

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,22 @@ end
118118

119119
M.setup = function(config)
120120
config = config or {}
121+
121122
-- setup the default values for all sources
122-
local sd = {}
123+
local source_defaults = {}
123124
for _, source_name in ipairs(sources) do
124125
local mod_root = "neo-tree.sources." .. source_name
125-
sd[source_name] = require(mod_root .. ".defaults")
126-
sd[source_name].components = require(mod_root .. ".components")
127-
sd[source_name].commands = require(mod_root .. ".commands")
128-
sd[source_name].name = source_name
129-
normalize_mappings(sd[source_name])
126+
local source = require(mod_root .. ".defaults")
127+
source.components = require(mod_root .. ".components")
128+
source.commands = require(mod_root .. ".commands")
129+
source.name = source_name
130+
source_defaults[source_name] = source
131+
132+
-- Make sure all the mappings are normalized so they will merge properly.
133+
normalize_mappings(source)
130134
normalize_mappings(config[source_name])
131135
end
132-
local default_config = utils.table_merge(defaults, sd)
136+
local default_config = utils.table_merge(defaults, source_defaults)
133137

134138
-- apply the users config
135139
M.config = utils.table_merge(default_config, config)

0 commit comments

Comments
 (0)