Skip to content

Commit eaac99e

Browse files
committed
chore(lint): triage new core/webview call sites after merging main
Also restore README.md to the upstream version, dropping an unintended formatter artifact picked up during the merge commit.
1 parent 3d42ee4 commit eaac99e

3 files changed

Lines changed: 28 additions & 15 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ for this exact support, so if you are having problems or if you have question, j
6666
- [Tiếng Việt](locales/vi/README.md)
6767
- [简体中文](locales/zh-CN/README.md)
6868
- [繁體中文](locales/zh-TW/README.md)
69-
</details>
69+
</details>
7070

7171
---
7272

src/core/webview/__tests__/ClineProvider.spec.ts

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
type ClineMessage,
1313
type ExtensionMessage,
1414
type ExtensionState,
15+
type WebviewMessage,
1516
ORGANIZATION_ALLOW_ALL,
1617
DEFAULT_CHECKPOINT_TIMEOUT_SECONDS,
1718
DEFAULT_DIFF_FUZZY_THRESHOLD,
@@ -788,7 +789,8 @@ describe("ClineProvider", () => {
788789
await provider.resolveWebviewView(mockWebviewView)
789790

790791
// Get the message handler from onDidReceiveMessage
791-
const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
792+
const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as ReturnType<typeof vi.fn>).mock
793+
.calls[0][0]
792794

793795
// Simulate webviewDidLaunch message
794796
await messageHandler({ type: "webviewDidLaunch" })
@@ -2391,7 +2393,7 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
23912393
}
23922394
const provider = createProvider({ getCurrentTask: vi.fn().mockReturnValue(task) })
23932395

2394-
await webviewMessageHandler(provider, { type: "terminalOperation", terminalOperation: "continue" } as any)
2396+
await webviewMessageHandler(provider, { type: "terminalOperation", terminalOperation: "continue" })
23952397
await webviewMessageHandler(provider, { type: "exportCurrentTask" })
23962398
await webviewMessageHandler(provider, { type: "showTaskWithId", text: "task-2" })
23972399
await webviewMessageHandler(provider, { type: "condenseTaskContextRequest", text: "task-2" })
@@ -2592,7 +2594,9 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
25922594
startIndexing: vi.fn().mockRejectedValue(new Error("auto-enable failure")),
25932595
})
25942596
Object.defineProperty(manager, "isWorkspaceEnabled", { get: () => workspaceEnabled })
2595-
const getAllInstances = vi.spyOn(CodeIndexManager, "getAllInstances").mockReturnValue([manager] as any)
2597+
const getAllInstances = vi
2598+
.spyOn(CodeIndexManager, "getAllInstances")
2599+
.mockReturnValue([manager] as unknown as ReturnType<typeof CodeIndexManager.getAllInstances>)
25962600
const provider = createProvider({
25972601
getCurrentWorkspaceCodeIndexManager: vi.fn().mockReturnValue(manager),
25982602
})
@@ -2633,36 +2637,45 @@ describe("webviewMessageHandler no-floating-promises coverage", () => {
26332637

26342638
it("covers changed marketplace error and removal responses", async () => {
26352639
const provider = createProvider()
2636-
const item = { id: "item-1" }
2637-
const options = { target: "project" }
2640+
const item = {
2641+
id: "item-1",
2642+
name: "Item 1",
2643+
description: "Test marketplace item",
2644+
type: "mode",
2645+
content: "slug: item-1",
2646+
} satisfies NonNullable<WebviewMessage["mpItem"]>
2647+
const options = { target: "project" } satisfies NonNullable<WebviewMessage["mpInstallOptions"]>
26382648
const marketplaceManager = {
26392649
installMarketplaceItem: vi.fn().mockRejectedValue(new Error("install failed")),
26402650
removeInstalledMarketplaceItem: vi
26412651
.fn()
26422652
.mockResolvedValueOnce(undefined)
26432653
.mockRejectedValueOnce(new Error("remove failed")),
26442654
}
2655+
const managerArgument = marketplaceManager as unknown as NonNullable<
2656+
Parameters<typeof webviewMessageHandler>[2]
2657+
>
26452658

26462659
await webviewMessageHandler(
26472660
provider,
2648-
{ type: "installMarketplaceItem", mpItem: item, mpInstallOptions: options } as any,
2649-
marketplaceManager as any,
2661+
{ type: "installMarketplaceItem", mpItem: item, mpInstallOptions: options },
2662+
managerArgument,
26502663
)
26512664
await webviewMessageHandler(
26522665
provider,
2653-
{ type: "removeInstalledMarketplaceItem", mpItem: item, mpInstallOptions: options } as any,
2654-
marketplaceManager as any,
2666+
{ type: "removeInstalledMarketplaceItem", mpItem: item, mpInstallOptions: options },
2667+
managerArgument,
26552668
)
26562669
await webviewMessageHandler(
26572670
provider,
2658-
{ type: "removeInstalledMarketplaceItem", mpItem: item, mpInstallOptions: options } as any,
2659-
marketplaceManager as any,
2671+
{ type: "removeInstalledMarketplaceItem", mpItem: item, mpInstallOptions: options },
2672+
managerArgument,
26602673
)
26612674
await webviewMessageHandler(provider, {
26622675
type: "removeInstalledMarketplaceItem",
26632676
mpItem: item,
26642677
mpInstallOptions: options,
2665-
} as any)
2678+
})
26662679

26672680
expect(provider.postMessageToWebview).toHaveBeenCalledWith(
26682681
expect.objectContaining({ type: "marketplaceInstallResult", success: false }),

src/core/webview/webviewMessageHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ export const webviewMessageHandler = async (
12871287
} catch (error) {
12881288
const errorMsg = error instanceof Error ? error.message : String(error)
12891289
provider.log(`[requestOllamaModels] Failed to refresh model cache for ${logBaseUrl}: ${errorMsg}`)
1290-
provider.postMessageToWebview({
1290+
await provider.postMessageToWebview({
12911291
type: "ollamaModels",
12921292
ollamaModels: {},
12931293
error: errorMsg,
@@ -1304,7 +1304,7 @@ export const webviewMessageHandler = async (
13041304
} catch (error) {
13051305
const errorMsg = error instanceof Error ? error.message : String(error)
13061306
provider.log(`[requestOllamaModels] Failed to read models for ${logBaseUrl}: ${errorMsg}`)
1307-
provider.postMessageToWebview({
1307+
await provider.postMessageToWebview({
13081308
type: "ollamaModels",
13091309
ollamaModels: {},
13101310
error: errorMsg,

0 commit comments

Comments
 (0)