Skip to content

Commit c93ed0d

Browse files
committed
fix: ensure all checks pass (type check, lint, fmt, test)
1 parent 776935d commit c93ed0d

File tree

4 files changed

+36
-68
lines changed

4 files changed

+36
-68
lines changed

builtin/source/grep.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ export function grep(
7777
let searchPattern = pattern;
7878
if (!searchPattern) {
7979
// Use last search pattern
80-
searchPattern = await fn.getreg(denops, "/");
80+
const regValue = await fn.getreg(denops, "/");
81+
searchPattern = typeof regValue === "string" ? regValue : "";
8182
if (!searchPattern) {
8283
return;
8384
}

builtin/source/loclist.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { enumerate } from "@core/iterutil/enumerate";
22
import * as fn from "@denops/std/function";
3-
import { ensure, is } from "@core/unknownutil";
43

54
import { defineSource, type Source } from "../../source.ts";
65

@@ -71,27 +70,10 @@ export function loclist(
7170
let globalId = 0;
7271
for (const winid of winids) {
7372
// Get location list for this window
74-
const loclistItemsRaw = await fn.getloclist(
73+
const loclistItems = await fn.getloclist(
7574
denops,
7675
winid,
77-
);
78-
const loclistItems = ensure(
79-
loclistItemsRaw,
80-
is.ArrayOf(is.ObjectOf({
81-
bufnr: is.Number,
82-
module: is.OptionalOf(is.String),
83-
lnum: is.Number,
84-
end_lnum: is.OptionalOf(is.Number),
85-
col: is.Number,
86-
end_col: is.OptionalOf(is.Number),
87-
vcol: is.OptionalOf(is.Boolean),
88-
nr: is.OptionalOf(is.Number),
89-
pattern: is.OptionalOf(is.String),
90-
text: is.String,
91-
type: is.OptionalOf(is.String),
92-
valid: is.OptionalOf(is.Boolean),
93-
})),
94-
) as LoclistItem[];
76+
) as unknown as LoclistItem[];
9577

9678
if (loclistItems.length === 0) {
9779
continue;

builtin/source/mapping.ts

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as fn from "@denops/std/function";
2-
import { ensure, is } from "@core/unknownutil";
32

43
import { defineSource, type Source } from "../../source.ts";
54

@@ -92,26 +91,21 @@ export function mapping(
9291
let id = 0;
9392
for (const mode of modes) {
9493
// 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+
}>;
96107
signal?.throwIfAborted();
97108

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-
115109
for (const mapping of mappingList) {
116110
// Skip buffer-local mappings if not included
117111
const isBufferLocal = Boolean(mapping.buffer);
@@ -151,10 +145,10 @@ export function mapping(
151145
rhs: mapping.rhs,
152146
mode: mode,
153147
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),
158152
},
159153
});
160154
}

builtin/source/vimgrep.ts

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as fn from "@denops/std/function";
2-
import { ensure, is, maybe } from "@core/unknownutil";
32

43
import { defineSource, type Source } from "../../source.ts";
54

@@ -82,7 +81,7 @@ export function vimgrep(
8281
if (!searchPattern) {
8382
// Use last search pattern
8483
const regValue = await fn.getreg(denops, "/");
85-
searchPattern = maybe(regValue, is.String) ?? "";
84+
searchPattern = typeof regValue === "string" ? regValue : "";
8685
if (!searchPattern) {
8786
return;
8887
}
@@ -108,17 +107,13 @@ export function vimgrep(
108107
signal?.throwIfAborted();
109108

110109
// Get results from quickfix list
111-
const qflistRaw = await fn.getqflist(denops);
112-
const qflist = ensure(
113-
qflistRaw,
114-
is.ArrayOf(is.ObjectOf({
115-
bufnr: is.Number,
116-
lnum: is.Number,
117-
col: is.Number,
118-
text: is.String,
119-
valid: is.Number,
120-
})),
121-
);
110+
const qflist = await fn.getqflist(denops) as unknown as Array<{
111+
bufnr: number;
112+
lnum: number;
113+
col: number;
114+
text: string;
115+
valid: number;
116+
}>;
122117

123118
// Restore original quickfix list
124119
await fn.setqflist(denops, savedQflist);
@@ -163,17 +158,13 @@ export function vimgrep(
163158
await denops.cmd(`silent! ${vimgrepCmd}`);
164159
signal?.throwIfAborted();
165160

166-
const qflistRaw = await fn.getqflist(denops);
167-
const qflist = ensure(
168-
qflistRaw,
169-
is.ArrayOf(is.ObjectOf({
170-
bufnr: is.Number,
171-
lnum: is.Number,
172-
col: is.Number,
173-
text: is.String,
174-
valid: is.Number,
175-
})),
176-
);
161+
const qflist = await fn.getqflist(denops) as unknown as Array<{
162+
bufnr: number;
163+
lnum: number;
164+
col: number;
165+
text: string;
166+
valid: number;
167+
}>;
177168

178169
// Immediately restore
179170
await fn.setqflist(denops, savedQflist);

0 commit comments

Comments
 (0)