Skip to content

Commit 10ca937

Browse files
liwilliam2021liwilliam2021
committed
new UI for edit
1 parent 1f01e57 commit 10ca937

File tree

19 files changed

+118
-43
lines changed

19 files changed

+118
-43
lines changed

‎src/core/webview/webviewMessageHandler.ts‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,26 @@ export const webviewMessageHandler = async (
6767
operation: "delete" | "edit",
6868
editedContent?: string,
6969
): Promise<void> => {
70+
// Different visual order of options based on operation type
71+
const options =
72+
operation === "edit"
73+
? [
74+
t("common:confirmation.edit_this_and_delete_subsequent"),
75+
t("common:confirmation.edit_just_this_message"),
76+
]
77+
: [
78+
t("common:confirmation.delete_just_this_message"),
79+
t("common:confirmation.delete_this_and_subsequent"),
80+
]
81+
7082
const answer = await vscode.window.showInformationMessage(
71-
t("common:confirmation.delete_message"),
83+
operation === "edit" ? t("common:confirmation.edit_message") : t("common:confirmation.delete_message"),
7284
{ modal: true },
73-
t("common:confirmation.just_this_message"),
74-
t("common:confirmation.this_and_subsequent"),
85+
...options,
7586
)
7687

77-
if (
78-
(answer === t("common:confirmation.just_this_message") ||
79-
answer === t("common:confirmation.this_and_subsequent")) &&
80-
provider.getCurrentCline()
81-
) {
88+
// Only proceed if user selected one of the options and we have a current cline
89+
if (answer && options.includes(answer) && provider.getCurrentCline()) {
8290
const timeCutoff = messageTs - 1000 // 1 second buffer before the message
8391
const currentCline = provider.getCurrentCline()!
8492

@@ -92,7 +100,12 @@ export const webviewMessageHandler = async (
92100
try {
93101
const { historyItem } = await provider.getTaskWithId(currentCline.taskId)
94102

95-
if (answer === t("common:confirmation.just_this_message")) {
103+
// Check if user selected the "just this message" option
104+
// For delete: options[0], for edit: options[1]
105+
if (
106+
(operation === "delete" && answer === options[0]) ||
107+
(operation === "edit" && answer === options[1])
108+
) {
96109
// Find the next user message first
97110
const nextUserMessage = currentCline.clineMessages
98111
.slice(messageIndex + 1)
@@ -132,7 +145,12 @@ export const webviewMessageHandler = async (
132145
)
133146
}
134147
}
135-
} else if (answer === t("common:confirmation.this_and_subsequent")) {
148+
} else if (
149+
// Check if user selected the "this and subsequent" option
150+
// For delete: options[1], for edit: options[0]
151+
(operation === "delete" && answer === options[1]) ||
152+
(operation === "edit" && answer === options[0])
153+
) {
136154
// Delete this message and all that follow
137155
await currentCline.overwriteClineMessages(currentCline.clineMessages.slice(0, messageIndex))
138156

‎src/i18n/locales/ca/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
"delete_config_profile": "Estàs segur que vols eliminar aquest perfil de configuració?",
2424
"delete_custom_mode": "Estàs segur que vols eliminar aquest mode personalitzat?",
2525
"delete_message": "Què vols eliminar?",
26-
"just_this_message": "Només aquest missatge",
27-
"this_and_subsequent": "Aquest i tots els missatges posteriors"
26+
"edit_message": "Eliminar tots els missatges després d'aquest?",
27+
"delete_just_this_message": "Només aquest missatge",
28+
"edit_just_this_message": "No, només editar aquest",
29+
"delete_this_and_subsequent": "Aquest i tots els missatges posteriors",
30+
"edit_this_and_delete_subsequent": "Sí"
2831
},
2932
"errors": {
3033
"invalid_data_uri": "Format d'URI de dades no vàlid",

‎src/i18n/locales/de/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "Möchtest du dieses Konfigurationsprofil wirklich löschen?",
2020
"delete_custom_mode": "Möchtest du diesen benutzerdefinierten Modus wirklich löschen?",
2121
"delete_message": "Was möchtest du löschen?",
22-
"just_this_message": "Nur diese Nachricht",
23-
"this_and_subsequent": "Diese und alle nachfolgenden Nachrichten"
22+
"edit_message": "Alle Nachrichten nach dieser löschen?",
23+
"delete_just_this_message": "Nur diese Nachricht",
24+
"edit_just_this_message": "Nein, nur diese bearbeiten",
25+
"delete_this_and_subsequent": "Diese und alle nachfolgenden Nachrichten",
26+
"edit_this_and_delete_subsequent": "Ja"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Ungültiges Daten-URI-Format",

‎src/i18n/locales/en/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "Are you sure you want to delete this configuration profile?",
2020
"delete_custom_mode": "Are you sure you want to delete this custom mode?",
2121
"delete_message": "What would you like to delete?",
22-
"just_this_message": "Just this message",
23-
"this_and_subsequent": "This and all subsequent messages"
22+
"edit_message": "Delete all messages after this one?",
23+
"delete_just_this_message": "Just this message",
24+
"edit_just_this_message": "No, just edit this one",
25+
"delete_this_and_subsequent": "This and all subsequent messages",
26+
"edit_this_and_delete_subsequent": "Yes"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Invalid data URI format",

‎src/i18n/locales/es/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "¿Estás seguro de que deseas eliminar este perfil de configuración?",
2020
"delete_custom_mode": "¿Estás seguro de que deseas eliminar este modo personalizado?",
2121
"delete_message": "¿Qué deseas eliminar?",
22-
"just_this_message": "Solo este mensaje",
23-
"this_and_subsequent": "Este y todos los mensajes posteriores"
22+
"edit_message": "¿Eliminar todos los mensajes posteriores a este?",
23+
"delete_just_this_message": "Solo este mensaje",
24+
"edit_just_this_message": "No, solo editar este",
25+
"delete_this_and_subsequent": "Este y todos los mensajes posteriores",
26+
"edit_this_and_delete_subsequent": "Sí"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Formato de URI de datos no válido",

‎src/i18n/locales/fr/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "Êtes-vous sûr de vouloir supprimer ce profil de configuration ?",
2020
"delete_custom_mode": "Êtes-vous sûr de vouloir supprimer ce mode personnalisé ?",
2121
"delete_message": "Que souhaitez-vous supprimer ?",
22-
"just_this_message": "Uniquement ce message",
23-
"this_and_subsequent": "Ce message et tous les messages suivants"
22+
"edit_message": "Supprimer tous les messages après celui-ci ?",
23+
"delete_just_this_message": "Uniquement ce message",
24+
"edit_just_this_message": "Non, modifier uniquement celui-ci",
25+
"delete_this_and_subsequent": "Ce message et tous les messages suivants",
26+
"edit_this_and_delete_subsequent": "Oui"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Format d'URI de données invalide",

‎src/i18n/locales/hi/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "क्या आप वाकई इस कॉन्फ़िगरेशन प्रोफ़ाइल को हटाना चाहते हैं?",
2020
"delete_custom_mode": "क्या आप वाकई इस कस्टम मोड को हटाना चाहते हैं?",
2121
"delete_message": "आप क्या हटाना चाहते हैं?",
22-
"just_this_message": "सिर्फ यह संदेश",
23-
"this_and_subsequent": "यह और सभी बाद के संदेश"
22+
"edit_message": "इसके बाद के सभी संदेशों को हटाएं?",
23+
"delete_just_this_message": "सिर्फ यह संदेश",
24+
"edit_just_this_message": "नहीं, केवल इसे संपादित करें",
25+
"delete_this_and_subsequent": "यह और सभी बाद के संदेश",
26+
"edit_this_and_delete_subsequent": "हां"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "अमान्य डेटा URI फॉर्मेट",

‎src/i18n/locales/id/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "Apakah kamu yakin ingin menghapus profil konfigurasi ini?",
2020
"delete_custom_mode": "Apakah kamu yakin ingin menghapus mode kustom ini?",
2121
"delete_message": "Apa yang ingin kamu hapus?",
22-
"just_this_message": "Hanya pesan ini",
23-
"this_and_subsequent": "Ini dan semua pesan selanjutnya"
22+
"edit_message": "Hapus semua pesan setelah ini?",
23+
"delete_just_this_message": "Hanya pesan ini",
24+
"edit_just_this_message": "Tidak, hanya edit yang ini",
25+
"delete_this_and_subsequent": "Ini dan semua pesan selanjutnya",
26+
"edit_this_and_delete_subsequent": "Ya"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Format data URI tidak valid",

‎src/i18n/locales/it/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "Sei sicuro di voler eliminare questo profilo di configurazione?",
2020
"delete_custom_mode": "Sei sicuro di voler eliminare questa modalità personalizzata?",
2121
"delete_message": "Cosa desideri eliminare?",
22-
"just_this_message": "Solo questo messaggio",
23-
"this_and_subsequent": "Questo e tutti i messaggi successivi"
22+
"edit_message": "Eliminare tutti i messaggi dopo questo?",
23+
"delete_just_this_message": "Solo questo messaggio",
24+
"edit_just_this_message": "No, modifica solo questo",
25+
"delete_this_and_subsequent": "Questo e tutti i messaggi successivi",
26+
"edit_this_and_delete_subsequent": "Sì"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "Formato URI dati non valido",

‎src/i18n/locales/ja/common.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
"delete_config_profile": "この設定プロファイルを削除してもよろしいですか？",
2020
"delete_custom_mode": "このカスタムモードを削除してもよろしいですか？",
2121
"delete_message": "何を削除しますか？",
22-
"just_this_message": "このメッセージのみ",
23-
"this_and_subsequent": "これ以降のすべてのメッセージ"
22+
"edit_message": "これ以降のメッセージをすべて削除しますか？",
23+
"delete_just_this_message": "このメッセージのみ",
24+
"edit_just_this_message": "いいえ、これだけを編集",
25+
"delete_this_and_subsequent": "これ以降のすべてのメッセージ",
26+
"edit_this_and_delete_subsequent": "はい"
2427
},
2528
"errors": {
2629
"invalid_data_uri": "データURIフォーマットが無効です",

0 commit comments

Comments
 (0)