Skip to content

Commit bb8f2f1

Browse files
committed
Rename mode to target across extension components
- sometimes we have such code blocks which use 'diff' markdown code block but in fact contain search/replace [Pasted text] - in `apps/editor/src/commands/apply-response-command/utils/response-parser/parsers/multiple-files-parser/test/cases/merge-conflicts-in-separate-code-blocks/merge-conflicts-in-separate-code-blocks.txt` changing [Fragment] to "### File: `src\index.ts`", breaks the parser - rename to 'target button' ├── apps │ └── editor │ └── src │ ├── commands │ │ └── apply-response-command │ │ ├── apply-response-command.ts │ │ ├── handlers │ │ │ ├── diff-handler.ts │ │ │ ├── fast-replace-handler.ts │ │ │ ├── restore-preview-handler.ts │ │ │ ├── search-replace-handler.ts │ │ │ └── truncated-handler.ts │ │ ├── response-processor.ts │ │ └── utils │ │ └── response-parser │ │ ├── parsers │ │ │ ├── diff-parser │ │ │ │ └── diff-parser.ts │ │ │ └── multiple-files-parser │ │ │ ├── helpers │ │ │ │ ├── create-or-update-file-item.ts │ │ │ │ ├── extract-and-set-workspace-path.ts │ │ │ │ ├── flush-text-block.ts │ │ │ │ └── process-conflict-markers.ts │ │ │ ├── index.ts │ │ │ ├── multiple-files-parser.ts │ │ │ └── test │ │ │ ├── cases │ │ │ │ ├── conflict-with-inline-file │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ ├── 2-conflict-with-inline-file.txt │ │ │ │ │ └── conflict-with-inline-file.txt │ │ │ │ ├── delete-file-header │ │ │ │ │ ├── 1-text.txt │ │ │ │ │ ├── 2-file.txt │ │ │ │ │ ├── 3-text.txt │ │ │ │ │ └── delete-file-header.txt │ │ │ │ ├── merge-conflicts-in-separate-code-blocks │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── merge-conflicts-in-separate-code-blocks.txt │ │ │ │ ├── merge-conflicts-merge-the-same-file │ │ │ │ │ ├── 1-text.txt │ │ │ │ │ ├── 2-file.txt │ │ │ │ │ └── merge-conflicts-merge-the-same-file.txt │ │ │ │ ├── merge-conflicts-three-dots │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── merge-conflicts-three-dots.txt │ │ │ │ ├── multiple-markdowns-with-headings │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ ├── 2-file.txt │ │ │ │ │ └── multiple-markdowns-with-headings.txt │ │ │ │ ├── path-above-code-block │ │ │ │ │ ├── 1-text.txt │ │ │ │ │ ├── 2-file.txt │ │ │ │ │ └── path-above-code-block.txt │ │ │ │ ├── path-above-code-block-bold │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── path-above-code-block-bold.txt │ │ │ │ ├── path-above-code-block-raw │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── path-above-code-block-raw.txt │ │ │ │ ├── path-above-code-block-renaming │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── path-above-code-block-renaming.txt │ │ │ │ ├── path-in-backticks-comment-with-intermediate-text │ │ │ │ │ ├── 1-text.txt │ │ │ │ │ ├── 2-file.txt │ │ │ │ │ └── path-in-backticks-comment-with-intermediate-text.txt │ │ │ │ ├── path-in-backticks-no-intermediate-empty-lines │ │ │ │ │ ├── 1-file.txt │ │ │ │ │ └── path-in-backticks-no-intermediate-empty-lines.txt │ │ │ │ └── text-below-code-block │ │ │ │ ├── 1-file.txt │ │ │ │ ├── 2-text.txt │ │ │ │ └── text-below-code-block.txt │ │ │ └── multiple-files-parser.spec.ts │ │ └── response-parser.ts │ └── views │ └── prompt │ └── frontend │ └── Home │ └── Home.tsx └── packages └── ui └── src └── components └── editor └── prompt └── TargetButton ├── TargetButton.module.scss ├── TargetButton.stories.tsx ├── TargetButton.tsx └── index.ts
1 parent 2c6b0d6 commit bb8f2f1

49 files changed

Lines changed: 430 additions & 401 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/editor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@
965965
"scope": "resource",
966966
"default": true
967967
},
968-
"codeWebChat.synchronizeEditFormatBetweenModes": {
968+
"codeWebChat.synchronizeEditFormatBetweenTargets": {
969969
"type": "boolean",
970970
"scope": "resource",
971971
"default": true

‎apps/editor/src/commands/apply-response-command/utils/response-parser/parsers/multiple-files-parser/multiple-files-parser.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,13 @@ export const parse_multiple_files = (params: {
284284

285285
last_seen_file_path_was_header = is_header_line
286286
if (is_header_line) {
287-
last_seen_header_was_persistent = /updated|new|renamed/i.test(line)
287+
const stripped = line
288+
.replace(/^###\s+/, '')
289+
.replace(/[`*]/g, '')
290+
.trim()
291+
last_seen_header_was_persistent =
292+
/updated|new|renamed|file/i.test(line) ||
293+
stripped == extracted_filename
288294
}
289295
header_path_already_used = false
290296
}

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,18 @@ export const parse_response = (params: {
114114
const diff_header_regex = /^---\s+.+\n\+\+\+\s+.+/m
115115
const git_diff_header_regex = /^diff --git /m
116116

117+
const has_search_replace_markers =
118+
processed_response.includes('<<<<<<<') &&
119+
processed_response.includes('=======') &&
120+
processed_response.includes('>>>>>>>')
121+
117122
if (
118-
hunk_header_regex.test(processed_response) ||
119-
diff_header_regex.test(processed_response) ||
120-
git_diff_header_regex.test(processed_response) ||
121-
processed_response.includes('```diff') ||
122-
processed_response.includes('```patch')
123+
!has_search_replace_markers &&
124+
(hunk_header_regex.test(processed_response) ||
125+
diff_header_regex.test(processed_response) ||
126+
git_diff_header_regex.test(processed_response) ||
127+
processed_response.includes('```diff') ||
128+
processed_response.includes('```patch'))
123129
) {
124130
const patches_or_text = extract_diffs({
125131
response_text: processed_response,

‎apps/editor/src/constants/state-keys.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ export const DUPLICATE_WORKSPACE_CONTEXT_STATE_KEY =
2727
'duplicate-workspace-context'
2828

2929
export const EDIT_FORMAT_STATE_KEY = 'edit-format'
30-
export const get_edit_format_state_key = (mode: string) => `edit-format-${mode}`
31-
export const WEB_MODE_STATE_KEY = 'web-mode'
32-
export const API_MODE_STATE_KEY = 'api-mode'
33-
export const PROMPT_VIEW_MODE_STATE_KEY = 'prompt-view-mode'
30+
export const get_edit_format_state_key = (target: string) =>
31+
`edit-format-${target}`
32+
export const WEB_TARGET_STATE_KEY = 'web-target'
33+
export const API_TARGET_STATE_KEY = 'api-target'
34+
export const PROMPT_VIEW_TARGET_STATE_KEY = 'prompt-view-target'
3435

3536
export const INSTRUCTIONS_EDIT_FILES_STATE_KEY = 'instructions-edit-files'
3637
export const INSTRUCTIONS_ASK_STATE_KEY = 'instructions-ask'

‎apps/editor/src/views/prompt/backend/message-handlers/handle-autofill.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as vscode from 'vscode'
33
import { build_prompt_payload } from './utils/build-prompt-payload'
44
import { get_last_used_web_configuration_key } from '@/constants/state-keys'
55
import { ConfigWebConfigurationFormat } from '@/utils/web-configuration-format-converters'
6-
import { MODE } from '@shared/types/mode'
6+
import { TARGET } from '@shared/types/mode'
77
import { WebPromptType } from '@shared/types/prompt-types'
88
import { CHATBOTS } from '@shared/constants/chatbots'
99
import { dictionary } from '@shared/constants/dictionary'
@@ -23,7 +23,7 @@ export const handle_autofill = async (params: {
2323
show_quick_pick?: boolean
2424
}): Promise<void> => {
2525
if (
26-
params.prompt_view_provider.mode == MODE.WEB &&
26+
params.prompt_view_provider.target == TARGET.WEB &&
2727
!params.prompt_view_provider.websocket_server_instance.is_connected_with_browser()
2828
) {
2929
vscode.window.showWarningMessage(
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
22

3-
export const handle_get_mode = (prompt_view_provider: PromptViewProvider) => {
3+
export const handle_get_target = (prompt_view_provider: PromptViewProvider) => {
44
prompt_view_provider.send_message({
5-
command: 'MODE',
6-
mode: prompt_view_provider.mode
5+
command: 'TARGET',
6+
target: prompt_view_provider.target
77
})
88
}

‎apps/editor/src/views/prompt/backend/message-handlers/handle-mode-changed.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
2-
import { ModeChangedMessage } from '@/views/prompt/types/messages'
2+
import { TargetChangedMessage } from '@/views/prompt/types/messages'
33

4-
export const handle_mode_changed = (
4+
export const handle_target_changed = (
55
prompt_view_provider: PromptViewProvider,
6-
message: ModeChangedMessage
6+
message: TargetChangedMessage
77
): void => {
8-
prompt_view_provider.mode = message.mode
8+
prompt_view_provider.target = message.target
99
prompt_view_provider.send_message({
1010
command: 'EDIT_FORMAT',
1111
edit_format: prompt_view_provider.edit_format

‎apps/editor/src/views/prompt/backend/message-handlers/handle-save-api-prompt-type.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const handle_save_api_prompt_type = async (
77
): Promise<void> => {
88
prompt_view_provider.api_prompt_type = prompt_type
99
await prompt_view_provider.extension_context.workspaceState.update(
10-
'api-mode',
10+
'api-target',
1111
prompt_type
1212
)
1313
}

‎apps/editor/src/views/prompt/backend/message-handlers/handle-save-edit-format.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import * as vscode from 'vscode'
22
import { get_edit_format_state_key } from '@/constants/state-keys'
33
import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
44
import { SaveEditFormatMessage } from '@/views/prompt/types/messages'
5-
import { MODE } from '@shared/types/mode'
5+
import { TARGET } from '@shared/types/mode'
66

77
export const handle_save_edit_format = async (
88
prompt_view_provider: PromptViewProvider,
99
message: SaveEditFormatMessage
1010
): Promise<void> => {
1111
const config = vscode.workspace.getConfiguration('codeWebChat')
1212
const synchronize = config.get<boolean>(
13-
'synchronizeEditFormatBetweenModes',
13+
'synchronizeEditFormatBetweenTargets',
1414
true
1515
)
1616

@@ -21,29 +21,29 @@ export const handle_save_edit_format = async (
2121
prompt_view_provider.api_edit_format = message.edit_format
2222
await Promise.all([
2323
prompt_view_provider.extension_context.workspaceState.update(
24-
get_edit_format_state_key(MODE.WEB),
24+
get_edit_format_state_key(TARGET.WEB),
2525
message.edit_format
2626
),
2727
prompt_view_provider.extension_context.globalState.update(
28-
get_edit_format_state_key(MODE.WEB),
28+
get_edit_format_state_key(TARGET.WEB),
2929
message.edit_format
3030
),
3131
prompt_view_provider.extension_context.workspaceState.update(
32-
get_edit_format_state_key(MODE.API),
32+
get_edit_format_state_key(TARGET.API),
3333
message.edit_format
3434
),
3535
prompt_view_provider.extension_context.globalState.update(
36-
get_edit_format_state_key(MODE.API),
36+
get_edit_format_state_key(TARGET.API),
3737
message.edit_format
3838
)
3939
])
4040
} else {
4141
await prompt_view_provider.extension_context.workspaceState.update(
42-
get_edit_format_state_key(prompt_view_provider.mode),
42+
get_edit_format_state_key(prompt_view_provider.target),
4343
message.edit_format
4444
)
4545
await prompt_view_provider.extension_context.globalState.update(
46-
get_edit_format_state_key(prompt_view_provider.mode),
46+
get_edit_format_state_key(prompt_view_provider.target),
4747
message.edit_format
4848
)
4949
}

‎apps/editor/src/views/prompt/backend/message-handlers/handle-save-web-prompt-type.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const handle_save_web_prompt_type = async (
77
): Promise<void> => {
88
prompt_view_provider.web_prompt_type = prompt_type
99
await prompt_view_provider.extension_context.workspaceState.update(
10-
'web-mode',
10+
'web-target',
1111
prompt_type
1212
)
1313
}

0 commit comments

Comments
 (0)