Skip to content

Commit 78be1b8

Browse files
committed
Revert "Clean up the tool progress UX"
This reverts commit 1c8071b.
1 parent 85dd1a1 commit 78be1b8

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

src/core/diff/strategies/multi-search-replace.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,20 +368,18 @@ Only use a single line of '=======' between search and replacement content, beca
368368
getProgressStatus(toolUse: ToolUse, result?: DiffResult): ToolProgressStatus {
369369
const diffContent = toolUse.params.diff
370370
if (diffContent) {
371-
const icon = "diff-multiple"
372-
const searchBlockCount = (diffContent.match(/SEARCH/g) || []).length
373371
if (toolUse.partial) {
374372
if (diffContent.length < 1000 || (diffContent.length / 50) % 10 === 0) {
375-
return { icon, text: `${searchBlockCount}` }
373+
return { text: `progressing ${(diffContent.match(/SEARCH/g) || []).length} blocks...` }
376374
}
377375
} else if (result) {
378-
if (result.failParts?.length) {
376+
const searchBlockCount = (diffContent.match(/SEARCH/g) || []).length
377+
if (result.failParts) {
379378
return {
380-
icon,
381-
text: `${searchBlockCount - result.failParts.length}/${searchBlockCount}`,
379+
text: `progressed ${searchBlockCount - result.failParts.length}/${searchBlockCount} blocks.`,
382380
}
383381
} else {
384-
return { icon, text: `${searchBlockCount}` }
382+
return { text: `progressed ${searchBlockCount} blocks.` }
385383
}
386384
}
387385
}

src/shared/ExtensionMessage.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,5 @@ export interface HumanRelayCancelMessage {
277277
export type ClineApiReqCancelReason = "streaming_failed" | "user_cancelled"
278278

279279
export type ToolProgressStatus = {
280-
icon?: string
281280
text?: string
282281
}

webview-ui/src/components/common/CodeAccordian.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,14 @@ const CodeAccordian = ({
9999
)}
100100
<div style={{ flexGrow: 1 }}></div>
101101
{progressStatus && progressStatus.text && (
102-
<>
103-
{progressStatus.icon && <span className={`codicon codicon-${progressStatus.icon} mr-1`} />}
104-
<span className="mr-1 ml-auto text-vscode-descriptionForeground">
105-
{progressStatus.text}
106-
</span>
107-
</>
102+
<span
103+
style={{
104+
color: "var(--vscode-descriptionForeground)",
105+
borderTop: isExpanded ? "1px solid var(--vscode-editorGroup-border)" : "none",
106+
marginLeft: "auto", // Right-align the text
107+
}}>
108+
{progressStatus.text}
109+
</span>
108110
)}
109111
<span className={`codicon codicon-chevron-${isExpanded ? "up" : "down"}`}></span>
110112
</div>

0 commit comments

Comments
 (0)