Skip to content

Commit 789a658

Browse files
committed
Standardize the chat response review promise resolver name to response_preview_promise_resolve
1 parent fbe97fd commit 789a658

6 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎packages/vscode/src/commands/apply-chat-response-command/apply-chat-response-command.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { FileInPreview } from '@shared/types/file-in-preview'
1010
import { PanelProvider } from '@/views/panel/backend/panel-provider'
1111
import { dictionary } from '@shared/constants/dictionary'
1212
import { WorkspaceProvider } from '@/context/providers/workspace-provider'
13-
import { code_review_promise_resolve } from './utils/preview/preview'
13+
import { response_preview_promise_resolve } from './utils/preview/preview'
1414
import { get_diff_stats } from './utils/preview/diff-utils'
1515
import { create_safe_path } from '@/utils/path-sanitizer'
1616
import {
@@ -51,15 +51,15 @@ export const apply_chat_response_command = (
5151
return
5252
}
5353

54-
if (code_review_promise_resolve) {
54+
if (response_preview_promise_resolve) {
5555
const choice = await vscode.window.showWarningMessage(
5656
dictionary.warning_message.REVIEW_ONGOING,
5757
{ modal: true },
5858
'Switch'
5959
)
6060

6161
if (choice == 'Switch') {
62-
code_review_promise_resolve({ accepted_files: [] })
62+
response_preview_promise_resolve({ accepted_files: [] })
6363
if (ongoing_review_cleanup_promise) {
6464
await ongoing_review_cleanup_promise
6565
}

‎packages/vscode/src/commands/apply-chat-response-command/utils/preview/preview.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { close_review_diff_editors, show_diff_with_actions } from './vscode-ui'
1313
import { PreparedFile, ReviewableFile } from './types'
1414
import { ItemInPreview } from '@shared/types/file-in-preview'
1515

16-
export { code_review_promise_resolve } from './vscode-ui'
16+
export { response_preview_promise_resolve } from './vscode-ui'
1717
export { toggle_file_review_state } from './workspace-listener'
1818

1919
export const preview = async (params: {

‎packages/vscode/src/commands/apply-chat-response-command/utils/preview/vscode-ui.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
22
import * as path from 'path'
33
import { CodeReviewDecision, CodeReviewResult, PreparedFile } from './types'
44

5-
export let code_review_promise_resolve:
5+
export let response_preview_promise_resolve:
66
| ((decision: CodeReviewDecision) => void)
77
| undefined
88

@@ -45,7 +45,7 @@ export const show_diff_with_actions = async (
4545
)
4646

4747
return new Promise<CodeReviewResult>((resolve) => {
48-
code_review_promise_resolve = async (decision) => {
48+
response_preview_promise_resolve = async (decision) => {
4949
let final_content = ''
5050
try {
5151
const right_doc = await vscode.workspace.openTextDocument(right_doc_uri)
@@ -59,6 +59,6 @@ export const show_diff_with_actions = async (
5959
})
6060
}
6161
}).finally(() => {
62-
code_review_promise_resolve = undefined
62+
response_preview_promise_resolve = undefined
6363
})
6464
}

‎packages/vscode/src/commands/apply-chat-response-command/utils/preview/workspace-listener.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export const setup_workspace_listeners = (
117117
.createHash('md5')
118118
.update(sanitized_file_path)
119119
.digest('hex')
120-
const temp_filename = `cwc-review-${hash}.tmp`
120+
const temp_filename = `cwc-${hash}.tmp`
121121
const temp_file_path = path.join(os.tmpdir(), temp_filename)
122122
const is_deleted =
123123
!is_new && new_content == '' && original_content != ''
@@ -194,7 +194,7 @@ export const setup_workspace_listeners = (
194194
.createHash('md5')
195195
.update(sanitized_file_path)
196196
.digest('hex')
197-
const temp_filename = `cwc-review-${hash}.tmp`
197+
const temp_filename = `cwc-${hash}.tmp`
198198
const temp_file_path = path.join(os.tmpdir(), temp_filename)
199199

200200
const reviewable_file: ReviewableFile = {
@@ -286,7 +286,7 @@ export const setup_workspace_listeners = (
286286
.createHash('md5')
287287
.update(sanitized_file_path)
288288
.digest('hex')
289-
const temp_filename = `cwc-review-${hash}.tmp`
289+
const temp_filename = `cwc-${hash}.tmp`
290290
const temp_file_path = path.join(os.tmpdir(), temp_filename)
291291

292292
const reviewable_file: ReviewableFile = {
@@ -386,7 +386,7 @@ export const setup_workspace_listeners = (
386386
.createHash('md5')
387387
.update(oldSanitized)
388388
.digest('hex')
389-
const oldTemp = path.join(os.tmpdir(), `cwc-review-${oldHash}.tmp`)
389+
const oldTemp = path.join(os.tmpdir(), `cwc-${oldHash}.tmp`)
390390

391391
const deleted_diff_stats = get_diff_stats({
392392
original_content: existing.original_content,
@@ -447,7 +447,7 @@ export const setup_workspace_listeners = (
447447
.createHash('md5')
448448
.update(newSanitized)
449449
.digest('hex')
450-
const newTemp = path.join(os.tmpdir(), `cwc-review-${newHash}.tmp`)
450+
const newTemp = path.join(os.tmpdir(), `cwc-${newHash}.tmp`)
451451

452452
const create_diff_stats = get_diff_stats({
453453
original_content: '',
@@ -478,7 +478,7 @@ export const setup_workspace_listeners = (
478478
.createHash('md5')
479479
.update(oldSanitized)
480480
.digest('hex')
481-
const oldTemp = path.join(os.tmpdir(), `cwc-review-${oldHash}.tmp`)
481+
const oldTemp = path.join(os.tmpdir(), `cwc-${oldHash}.tmp`)
482482

483483
const deleted_diff_stats = get_diff_stats({
484484
original_content: new_content,

‎packages/vscode/src/views/panel/backend/message-handlers/handle-focus-on-file-in-preview.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { code_review_promise_resolve } from '@/commands/apply-chat-response-command/utils/preview'
1+
import { response_preview_promise_resolve } from '@/commands/apply-chat-response-command/utils/preview'
22
import { PanelProvider } from '@/views/panel/backend/panel-provider'
33
import { FocusOnFileInPreviewMessage } from '@/views/panel/types/messages'
44

55
export const handle_focus_on_file_in_preview = (
66
_provider: PanelProvider,
77
message: FocusOnFileInPreviewMessage
88
): void => {
9-
if (code_review_promise_resolve) {
10-
code_review_promise_resolve({
9+
if (response_preview_promise_resolve) {
10+
response_preview_promise_resolve({
1111
jump_to: {
1212
file_path: message.file_path,
1313
workspace_name: message.workspace_name

‎packages/vscode/src/views/panel/backend/panel-provider.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ import { OriginalFileState } from '@/commands/apply-chat-response-command/types/
8181
import { CHATBOTS } from '@shared/constants/chatbots'
8282
import { HOME_VIEW_TYPES, HomeViewType } from '../types/home-view-type'
8383
import { ApiMode, WebMode } from '@shared/types/modes'
84-
import { code_review_promise_resolve } from '@/commands/apply-chat-response-command/utils/preview'
84+
import { response_preview_promise_resolve } from '@/commands/apply-chat-response-command/utils/preview'
8585
import { Logger } from '@shared/utils/logger'
8686
import { CancelTokenSource } from 'axios'
8787
import { update_last_used_preset_or_group } from './message-handlers/update-last-used-preset-or-group'
@@ -451,8 +451,10 @@ export class PanelProvider implements vscode.WebviewViewProvider {
451451
} else if (message.command == 'INTELLIGENT_UPDATE_FILE_IN_PREVIEW') {
452452
await handle_intelligent_update_file_in_preview(this, message)
453453
} else if (message.command == 'EDITS_REVIEW') {
454-
if (code_review_promise_resolve) {
455-
code_review_promise_resolve({ accepted_files: message.files })
454+
if (response_preview_promise_resolve) {
455+
response_preview_promise_resolve({
456+
accepted_files: message.files
457+
})
456458
}
457459
} else if (message.command == 'GET_WORKSPACE_STATE') {
458460
this.send_message({

0 commit comments

Comments
 (0)