Skip to content

Commit ad5ca25

Browse files
committed
Add mergeParams
1 parent 511a3c1 commit ad5ca25

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

denops/ddc/context.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ function overwrite<T>(a: T, b: Partial<T>): T {
4343
export const mergeUiOptions: Merge<UiOptions> = overwrite;
4444
export const mergeSourceOptions: Merge<SourceOptions> = overwrite;
4545
export const mergeFilterOptions: Merge<FilterOptions> = overwrite;
46-
export const mergeUiParams: Merge<BaseParams> = overwrite;
47-
export const mergeSourceParams: Merge<BaseParams> = overwrite;
48-
export const mergeFilterParams: Merge<BaseParams> = overwrite;
46+
47+
export const mergeParams: Merge<BaseParams> = overwrite;
4948

5049
export function foldMerge<T>(
5150
merge: Merge<T>,

denops/ddc/ext.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ import {
2020
defaultDummy,
2121
foldMerge,
2222
mergeFilterOptions,
23-
mergeFilterParams,
23+
mergeParams,
2424
mergeSourceOptions,
25-
mergeSourceParams,
2625
mergeUiOptions,
27-
mergeUiParams,
2826
} from "./context.ts";
2927
import type { Loader } from "./loader.ts";
3028
import { isDdcCallbackCancelError } from "./callback.ts";
@@ -438,7 +436,7 @@ function uiArgs<Params extends BaseParams>(
438436
defaultUiOptions,
439437
[options.uiOptions["_"], options.uiOptions[ui.name]],
440438
);
441-
const p = foldMerge(mergeUiParams, defaultDummy, [
439+
const p = foldMerge(mergeParams, defaultDummy, [
442440
ui.params ? ui.params() : null,
443441
options.uiParams[ui.name],
444442
]);
@@ -470,7 +468,7 @@ function sourceArgs<
470468
],
471469
);
472470
const p = foldMerge(
473-
mergeSourceParams,
471+
mergeParams,
474472
defaultDummy,
475473
[
476474
source?.params(),
@@ -506,7 +504,7 @@ function filterArgs<
506504
],
507505
);
508506
const p = foldMerge(
509-
mergeFilterParams,
507+
mergeParams,
510508
defaultDummy,
511509
[
512510
filter?.params(),

0 commit comments

Comments
 (0)