Skip to content

Commit 1521e95

Browse files
diarmidmackenziediarmidmackenzie
committed
Prefer this/provider.log over outputChannel.appendLine
log is already public, outputChannel should be private. But also prefer log internally for the additional value of console logging, plus code brevity.
1 parent d8aba89 commit 1521e95

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎src/core/webview/ClineProvider.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
9292
) {
9393
super()
9494

95-
this.outputChannel.appendLine("ClineProvider instantiated")
95+
this.log("ClineProvider instantiated")
9696
this.contextProxy = new ContextProxy(context)
9797
ClineProvider.activeInstances.add(this)
9898

@@ -114,7 +114,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
114114
this.mcpHub = hub
115115
})
116116
.catch((error) => {
117-
this.outputChannel.appendLine(`Failed to initialize MCP Hub: ${error}`)
117+
this.log(`Failed to initialize MCP Hub: ${error}`)
118118
})
119119
}
120120

@@ -199,13 +199,13 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
199199
- https://github.com/microsoft/vscode-extension-samples/blob/main/webview-sample/src/extension.ts
200200
*/
201201
async dispose() {
202-
this.outputChannel.appendLine("Disposing ClineProvider...")
202+
this.log("Disposing ClineProvider...")
203203
await this.removeClineFromStack()
204-
this.outputChannel.appendLine("Cleared task")
204+
this.log("Cleared task")
205205

206206
if (this.view && "dispose" in this.view) {
207207
this.view.dispose()
208-
this.outputChannel.appendLine("Disposed webview")
208+
this.log("Disposed webview")
209209
}
210210

211211
while (this.disposables.length) {
@@ -221,7 +221,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
221221
this.mcpHub?.dispose()
222222
this.mcpHub = undefined
223223
this.customModesManager?.dispose()
224-
this.outputChannel.appendLine("Disposed all disposables")
224+
this.log("Disposed all disposables")
225225
ClineProvider.activeInstances.delete(this)
226226

227227
// Unregister from McpServerManager
@@ -334,7 +334,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
334334
}
335335

336336
async resolveWebviewView(webviewView: vscode.WebviewView | vscode.WebviewPanel) {
337-
this.outputChannel.appendLine("Resolving webview view")
337+
this.log("Resolving webview view")
338338

339339
if (!this.contextProxy.isInitialized) {
340340
await this.contextProxy.initialize()
@@ -437,7 +437,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
437437
// If the extension is starting a new session, clear previous task state.
438438
await this.removeClineFromStack()
439439

440-
this.outputChannel.appendLine("Webview view resolved")
440+
this.log("Webview view resolved")
441441
}
442442

443443
public async initClineWithSubTask(parent: Cline, task?: string, images?: string[]) {
@@ -926,7 +926,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
926926
throw new Error("Invalid response from OpenRouter API")
927927
}
928928
} catch (error) {
929-
this.outputChannel.appendLine(
929+
this.log(
930930
`Error exchanging code for API key: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
931931
)
932932
throw error
@@ -955,7 +955,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
955955
throw new Error("Invalid response from Glama API")
956956
}
957957
} catch (error) {
958-
this.outputChannel.appendLine(
958+
this.log(
959959
`Error exchanging code for API key: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
960960
)
961961
throw error
@@ -1005,7 +1005,7 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
10051005

10061006
await this.postStateToWebview()
10071007
} catch (error) {
1008-
this.outputChannel.appendLine(
1008+
this.log(
10091009
`Error create new api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
10101010
)
10111011
vscode.window.showErrorMessage(t("common:errors.create_api_config"))

‎src/core/webview/webviewMessageHandler.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
215215
])
216216
})
217217
.catch((error) =>
218-
provider.outputChannel.appendLine(
218+
provider.log(
219219
`Error list api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
220220
),
221221
)
@@ -533,12 +533,12 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
533533
}
534534

535535
try {
536-
provider.outputChannel.appendLine(`Attempting to delete MCP server: ${message.serverName}`)
536+
provider.log(`Attempting to delete MCP server: ${message.serverName}`)
537537
await provider.getMcpHub()?.deleteServer(message.serverName, message.source as "global" | "project")
538-
provider.outputChannel.appendLine(`Successfully deleted MCP server: ${message.serverName}`)
538+
provider.log(`Successfully deleted MCP server: ${message.serverName}`)
539539
} catch (error) {
540540
const errorMessage = error instanceof Error ? error.message : String(error)
541-
provider.outputChannel.appendLine(`Failed to delete MCP server: ${errorMessage}`)
541+
provider.log(`Failed to delete MCP server: ${errorMessage}`)
542542
// Error messages are already handled by McpHub.deleteServer
543543
}
544544
break
@@ -547,7 +547,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
547547
try {
548548
await provider.getMcpHub()?.restartConnection(message.text!, message.source as "global" | "project")
549549
} catch (error) {
550-
provider.outputChannel.appendLine(
550+
provider.log(
551551
`Failed to retry connection for ${message.text}: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
552552
)
553553
}
@@ -564,7 +564,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
564564
Boolean(message.alwaysAllow),
565565
)
566566
} catch (error) {
567-
provider.outputChannel.appendLine(
567+
provider.log(
568568
`Failed to toggle auto-approve for tool ${message.toolName}: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
569569
)
570570
}
@@ -580,7 +580,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
580580
message.source as "global" | "project",
581581
)
582582
} catch (error) {
583-
provider.outputChannel.appendLine(
583+
provider.log(
584584
`Failed to toggle MCP server ${message.serverName}: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
585585
)
586586
}
@@ -750,7 +750,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
750750
await updateGlobalState("customSupportPrompts", updatedPrompts)
751751
await provider.postStateToWebview()
752752
} catch (error) {
753-
provider.outputChannel.appendLine(
753+
provider.log(
754754
`Error update support prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
755755
)
756756
vscode.window.showErrorMessage(t("common:errors.update_support_prompt"))
@@ -768,7 +768,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
768768
await updateGlobalState("customSupportPrompts", updatedPrompts)
769769
await provider.postStateToWebview()
770770
} catch (error) {
771-
provider.outputChannel.appendLine(
771+
provider.log(
772772
`Error reset support prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
773773
)
774774
vscode.window.showErrorMessage(t("common:errors.reset_support_prompt"))
@@ -978,7 +978,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
978978
text: enhancedPrompt,
979979
})
980980
} catch (error) {
981-
provider.outputChannel.appendLine(
981+
provider.log(
982982
`Error enhancing prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
983983
)
984984
vscode.window.showErrorMessage(t("common:errors.enhance_prompt"))
@@ -998,7 +998,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
998998
mode: message.mode,
999999
})
10001000
} catch (error) {
1001-
provider.outputChannel.appendLine(
1001+
provider.log(
10021002
`Error getting system prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
10031003
)
10041004
vscode.window.showErrorMessage(t("common:errors.get_system_prompt"))
@@ -1011,7 +1011,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
10111011
await vscode.env.clipboard.writeText(systemPrompt)
10121012
await vscode.window.showInformationMessage(t("common:info.clipboard_copy"))
10131013
} catch (error) {
1014-
provider.outputChannel.appendLine(
1014+
provider.log(
10151015
`Error getting system prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
10161016
)
10171017
vscode.window.showErrorMessage(t("common:errors.get_system_prompt"))
@@ -1027,7 +1027,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
10271027
commits,
10281028
})
10291029
} catch (error) {
1030-
provider.outputChannel.appendLine(
1030+
provider.log(
10311031
`Error searching commits: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
10321032
)
10331033
vscode.window.showErrorMessage(t("common:errors.search_commits"))
@@ -1082,7 +1082,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
10821082
const listApiConfig = await provider.providerSettingsManager.listConfig()
10831083
await updateGlobalState("listApiConfigMeta", listApiConfig)
10841084
} catch (error) {
1085-
provider.outputChannel.appendLine(
1085+
provider.log(
10861086
`Error save api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
10871087
)
10881088
vscode.window.showErrorMessage(t("common:errors.save_api_config"))
@@ -1124,7 +1124,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
11241124

11251125
await provider.postStateToWebview()
11261126
} catch (error) {
1127-
provider.outputChannel.appendLine(
1127+
provider.log(
11281128
`Error rename api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
11291129
)
11301130
vscode.window.showErrorMessage(t("common:errors.rename_api_config"))
@@ -1145,7 +1145,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
11451145

11461146
await provider.postStateToWebview()
11471147
} catch (error) {
1148-
provider.outputChannel.appendLine(
1148+
provider.log(
11491149
`Error load api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
11501150
)
11511151
vscode.window.showErrorMessage(t("common:errors.load_api_config"))
@@ -1168,7 +1168,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
11681168

11691169
await provider.postStateToWebview()
11701170
} catch (error) {
1171-
provider.outputChannel.appendLine(
1171+
provider.log(
11721172
`Error load api configuration by ID: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
11731173
)
11741174
vscode.window.showErrorMessage(t("common:errors.load_api_config"))
@@ -1207,7 +1207,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
12071207

12081208
await provider.postStateToWebview()
12091209
} catch (error) {
1210-
provider.outputChannel.appendLine(
1210+
provider.log(
12111211
`Error delete api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
12121212
)
12131213
vscode.window.showErrorMessage(t("common:errors.delete_api_config"))
@@ -1220,7 +1220,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
12201220
await updateGlobalState("listApiConfigMeta", listApiConfig)
12211221
provider.postMessageToWebview({ type: "listApiConfig", listApiConfig })
12221222
} catch (error) {
1223-
provider.outputChannel.appendLine(
1223+
provider.log(
12241224
`Error get list api configuration: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
12251225
)
12261226
vscode.window.showErrorMessage(t("common:errors.list_api_config"))
@@ -1259,7 +1259,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
12591259
message.source as "global" | "project",
12601260
)
12611261
} catch (error) {
1262-
provider.outputChannel.appendLine(
1262+
provider.log(
12631263
`Failed to update timeout for ${message.serverName}: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`,
12641264
)
12651265
vscode.window.showErrorMessage(t("common:errors.update_server_timeout"))

0 commit comments

Comments
 (0)