Skip to content

Commit dda9160

Browse files
committed
Select the first non-deleted file by default in response preview
- the problem: in response preview, when first file is deleted, and there is some created/modified below, we should focus on first such created/modified file with the diff preview. ├── apps │ └── editor │ └── src │ ├── commands │ │ └── apply-response-command │ │ ├── types │ │ │ └── original-file-state.ts │ │ └── utils │ │ ├── file-operations │ │ │ └── handle-deleted-file-item.ts │ │ └── preview │ │ ├── file-preparer.ts │ │ ├── index.ts │ │ ├── preview.ts │ │ ├── types.ts │ │ └── vscode-ui.ts │ └── views │ └── prompt │ ├── backend │ │ ├── message-handlers │ │ │ └── handle-focus-on-file-in-preview.ts │ │ └── prompt-view-provider.ts │ ├── frontend │ │ ├── Prompt.tsx │ │ └── hooks │ │ └── use-preview-manager.ts │ └── types │ └── messages.ts └── packages ├── shared │ └── src │ └── types │ └── file-in-preview.ts └── ui └── src └── components └── editor └── prompt-view └── ResponsePreview ├── ResponsePreview.tsx ├── components │ ├── FileItem │ │ ├── FileItem.tsx │ │ └── index.ts │ └── index.ts └── index.ts
1 parent 7f67d8c commit dda9160

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

  • apps/editor/src/commands/apply-response-command/utils/preview
  • packages/ui/src/components/editor/prompt-view/ResponsePreview

‎apps/editor/src/commands/apply-response-command/utils/preview/preview.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,13 @@ export const preview = async (params: {
164164
}))
165165

166166
let current_index = 0
167+
const first_non_deleted_index = preview_items.findIndex(
168+
(item) => item.file.previewable_file.file_state !== 'deleted'
169+
)
170+
if (first_non_deleted_index !== -1) {
171+
current_index = first_non_deleted_index
172+
}
173+
167174
while (current_index >= 0 && current_index < preview_items.length) {
168175
const preview_item = preview_items[current_index]
169176

‎packages/ui/src/components/editor/prompt-view/ResponsePreview/ResponsePreview.tsx‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ type Props = {
5252

5353
export const ResponsePreview: FC<Props> = (props) => {
5454
const [last_clicked_file_index, set_last_clicked_file_index] = useState(
55-
props.items.findIndex((i) => i.type === 'file')
55+
() => {
56+
const first_non_deleted = props.items.findIndex(
57+
(i) => i.type === 'file' && i.file_state !== 'deleted'
58+
)
59+
return first_non_deleted !== -1
60+
? first_non_deleted
61+
: props.items.findIndex((i) => i.type === 'file')
62+
}
5663
)
5764
const [expanded_text_items, set_expanded_text_items] = useState<Set<number>>(
5865
new Set()
@@ -144,7 +151,12 @@ export const ResponsePreview: FC<Props> = (props) => {
144151
)
145152

146153
useEffect(() => {
147-
if (error_count > 0 && !is_fixing_all && !has_attempted_auto_fix && !props.is_from_agentic_cli) {
154+
if (
155+
error_count > 0 &&
156+
!is_fixing_all &&
157+
!has_attempted_auto_fix &&
158+
!props.is_from_agentic_cli
159+
) {
148160
set_is_fixing_all(true)
149161
set_has_attempted_auto_fix(true)
150162
const files_to_fix = files_in_preview
@@ -158,7 +170,13 @@ export const ResponsePreview: FC<Props> = (props) => {
158170
}))
159171
props.on_fix_all_failed(files_to_fix, true)
160172
}
161-
}, [error_count, is_fixing_all, has_attempted_auto_fix, files_in_preview, props.is_from_agentic_cli])
173+
}, [
174+
error_count,
175+
is_fixing_all,
176+
has_attempted_auto_fix,
177+
files_in_preview,
178+
props.is_from_agentic_cli
179+
])
162180

163181
const get_status_text = (file: FileInPreview) => {
164182
if (file.apply_status === 'waiting') return 'Waiting for server...'

0 commit comments

Comments
 (0)