From 47b04e12f37f81ae525567193f7ca668b25b84fa Mon Sep 17 00:00:00 2001 From: Roo Code Date: Sat, 19 Jul 2025 18:33:32 +0000 Subject: [PATCH] fix: resolve duplicate state variable declaration in multiApplyDiffTool.ts - Renamed the second 'state' variable to 'providerState' to fix TypeScript compilation error - This resolves the CI failures in compile, unit test, and integration test jobs --- src/core/tools/multiApplyDiffTool.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/tools/multiApplyDiffTool.ts b/src/core/tools/multiApplyDiffTool.ts index 7584767cf5..cd4d2e0b49 100644 --- a/src/core/tools/multiApplyDiffTool.ts +++ b/src/core/tools/multiApplyDiffTool.ts @@ -412,8 +412,8 @@ Original error: ${errorMessage}` // Apply HTML entity unescaping based on user setting let processedDiffItems = diffItems - const state = (await cline.providerRef.deref()?.getState()) ?? {} - const unescapeHtmlEntitiesInDiffs = (state as any).unescapeHtmlEntitiesInDiffs ?? false + const providerState = (await cline.providerRef.deref()?.getState()) ?? {} + const unescapeHtmlEntitiesInDiffs = (providerState as any).unescapeHtmlEntitiesInDiffs ?? false if (unescapeHtmlEntitiesInDiffs && !cline.api.getModel().id.includes("claude")) { processedDiffItems = diffItems.map((item) => ({