|
1 | 1 | import * as fn from "@denops/std/function"; |
2 | | -import { ensure, is } from "@core/unknownutil"; |
3 | 2 |
|
4 | 3 | import { defineSource, type Source } from "../../source.ts"; |
5 | 4 |
|
@@ -92,26 +91,21 @@ export function mapping( |
92 | 91 | let id = 0; |
93 | 92 | for (const mode of modes) { |
94 | 93 | // Get mappings for this mode |
95 | | - const mappingListRaw = await fn.maplist(denops, mode); |
| 94 | + const mappingList = await fn.maplist(denops, mode) as Array<{ |
| 95 | + lhs: string; |
| 96 | + rhs: string; |
| 97 | + silent: number | boolean; |
| 98 | + noremap: number | boolean; |
| 99 | + nowait: number | boolean; |
| 100 | + expr: number | boolean; |
| 101 | + buffer: number | boolean; |
| 102 | + mode?: string; |
| 103 | + sid?: number; |
| 104 | + lnum?: number; |
| 105 | + script?: number | boolean; |
| 106 | + }>; |
96 | 107 | signal?.throwIfAborted(); |
97 | 108 |
|
98 | | - const mappingList = ensure( |
99 | | - mappingListRaw, |
100 | | - is.ArrayOf(is.ObjectOf({ |
101 | | - lhs: is.String, |
102 | | - rhs: is.String, |
103 | | - silent: is.OneOf([is.Number, is.Boolean]), |
104 | | - noremap: is.OneOf([is.Number, is.Boolean]), |
105 | | - nowait: is.OneOf([is.Number, is.Boolean]), |
106 | | - expr: is.OneOf([is.Number, is.Boolean]), |
107 | | - buffer: is.OneOf([is.Number, is.Boolean]), |
108 | | - mode: is.OptionalOf(is.String), |
109 | | - sid: is.OptionalOf(is.Number), |
110 | | - lnum: is.OptionalOf(is.Number), |
111 | | - script: is.OptionalOf(is.OneOf([is.Number, is.Boolean])), |
112 | | - })), |
113 | | - ); |
114 | | - |
115 | 109 | for (const mapping of mappingList) { |
116 | 110 | // Skip buffer-local mappings if not included |
117 | 111 | const isBufferLocal = Boolean(mapping.buffer); |
@@ -151,10 +145,10 @@ export function mapping( |
151 | 145 | rhs: mapping.rhs, |
152 | 146 | mode: mode, |
153 | 147 | bufferLocal: isBufferLocal, |
154 | | - silent: mapping.silent, |
155 | | - noremap: mapping.noremap, |
156 | | - nowait: mapping.nowait, |
157 | | - expr: mapping.expr, |
| 148 | + silent: Boolean(mapping.silent), |
| 149 | + noremap: Boolean(mapping.noremap), |
| 150 | + nowait: Boolean(mapping.nowait), |
| 151 | + expr: Boolean(mapping.expr), |
158 | 152 | }, |
159 | 153 | }); |
160 | 154 | } |
|
0 commit comments