Skip to content

Commit 3d4a235

Browse files
committed
fix: configuration was not properly applied
1 parent 789dae1 commit 3d4a235

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

denops/fall/config.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,12 @@ export function loadUserConfig(
9696
// Avoid reloading when the user config is not yet loaded.
9797
reload = initialized ? reload : false;
9898
initialized = (async () => {
99-
const ctx = {
100-
denops,
101-
refineGlobalConfig: buildRefineGlobalConfig(globalConfig),
102-
refineActionPicker: buildRefineActionPicker(actionPickerParams),
103-
defineItemPickerFromSource: buildDefineItemPickerFromSource(
104-
itemPickerParamsMap,
105-
),
106-
defineItemPickerFromCurator: buildDefineItemPickerFromCurator(
107-
itemPickerParamsMap,
108-
),
109-
};
11099
const configUrl = await getUserConfigUrl(denops);
111100
const suffix = reload ? `#${performance.now()}` : "";
112101
try {
113102
const { main } = await import(`${configUrl.href}${suffix}`);
114103
reset();
115-
await main(ctx);
104+
await main(buildContext(denops));
116105
if (verbose) {
117106
await denops.cmd(
118107
`echomsg "[fall] User config is loaded: ${configUrl}"`,
@@ -140,7 +129,7 @@ export function loadUserConfig(
140129
}
141130
const { main } = await import(defaultConfigUrl.href);
142131
reset();
143-
await main(ctx);
132+
await main(buildContext(denops));
144133
if (verbose) {
145134
await denops.cmd(
146135
`echomsg "[fall] Default config is loaded: ${defaultConfigUrl}"`,
@@ -242,6 +231,20 @@ function reset(): void {
242231
itemPickerParamsMap.clear();
243232
}
244233

234+
function buildContext(denops: Denops) {
235+
return {
236+
denops,
237+
refineGlobalConfig: buildRefineGlobalConfig(globalConfig),
238+
refineActionPicker: buildRefineActionPicker(actionPickerParams),
239+
defineItemPickerFromSource: buildDefineItemPickerFromSource(
240+
itemPickerParamsMap,
241+
),
242+
defineItemPickerFromCurator: buildDefineItemPickerFromCurator(
243+
itemPickerParamsMap,
244+
),
245+
};
246+
}
247+
245248
async function getUserConfigUrl(denops: Denops): Promise<URL> {
246249
try {
247250
const path = await vars.g.get(denops, "fall_config_path") as string;

0 commit comments

Comments
 (0)