Simplify context deletion messages and prevent race conditions during undo operations

robertpiosik · robertpiosik · commit aeb11645a940 · 2025-12-14T01:28:51.000+01:00
diff --git a/packages/shared/src/constants/dictionary.ts b/packages/shared/src/constants/dictionary.ts
@@ -75,8 +75,7 @@ export const dictionary = {
       'No "Edit Context" configurations found. Please add one in the settings.',
     PRESET_PREVIEW_SENT_TO_BROWSER:
       'Preset preview sent to the connected browser.',
-    DELETED_CONTEXT_FROM_ALL_ROOTS: (context_name: string) =>
-      `Deleted context "${context_name}" from all workspace roots`,
+    DELETED_CONTEXT_FROM_ALL_ROOTS: 'Deleted context.',
     NO_HISTORY_FOR_MODE: 'No history to show for the current mode.',
     NO_TEXT_SELECTED_FOR_SELECTION_PLACEHOLDER:
       'No text selected for #Selection placeholder.',
@@ -91,8 +90,7 @@ export const dictionary = {
       'No actionable unstaged files found (e.g. only deletions).',
     SELECTED_FILES: (count: number) =>
       `Selected ${count} file${count == 1 ? '' : 's'}.`,
-    DELETED_CONTEXT_FROM_WORKSPACE_STATE: (context_name: string) =>
-      `Deleted context "${context_name}" from workspace state`,
+    DELETED_CONTEXT_FROM_WORKSPACE_STATE: 'Deleted context.',
     CONTEXT_SAVED_SUCCESSFULLY: 'Context saved successfully.',
     FILES_REMAIN_CHECKED: (count: number) =>
       `${count} file${count == 1 ? '' : 's'} remain${
@@ -174,8 +172,8 @@ export const dictionary = {
       `Are you sure you want to delete this ${item_type}?`,
     CONFIRM_DELETE_NAMED_ITEM: (item_type: string, name: string) =>
       `Are you sure you want to delete ${item_type} "${name}"?`,
-    CONTEXT_WITH_IDENTICAL_PATHS_EXISTS: (context_name: string) =>
-      `A context with identical paths already exists in workspace state: "${context_name}"`,
+    CONTEXT_ALREADY_SAVED: (context_name: string) =>
+      `Context already saved: "${context_name}"`,
     CONFIRM_OVERWRITE_CONTEXT: (context_name: string) =>
       `A context named "${context_name}" already exists. Overwrite?`,
     CONFIRM_OVERWRITE_CONTEXT_IN_WORKSPACE_STATE: (context_name: string) =>
diff --git a/packages/vscode/src/commands/apply-context-command/sources/json-file-source.ts b/packages/vscode/src/commands/apply-context-command/sources/json-file-source.ts
@@ -8,6 +8,8 @@ import { Logger } from '@shared/utils/logger'
 import { dictionary } from '@shared/constants/dictionary'
 import { apply_saved_context } from '../utils'
 
+let active_deletion_timestamp: number | undefined
+
 async function save_contexts_to_file(
   contexts: SavedContext[],
   file_path: string
@@ -171,7 +173,7 @@ export async function handle_json_file_source(
       }
     }
 
-    let is_showing_dialog = false
+    let active_dialog_count = 0
     let go_back_after_delete = false
     const quick_pick_promise = new Promise<
       | 'back'
@@ -209,7 +211,7 @@ export async function handle_json_file_source(
         }),
 
         quick_pick.onDidHide(() => {
-          if (is_showing_dialog) {
+          if (active_dialog_count > 0) {
             return
           }
           if (go_back_after_delete) {
@@ -233,7 +235,7 @@ export async function handle_json_file_source(
           )
 
           if (event.button === edit_button) {
-            is_showing_dialog = true
+            active_dialog_count++
 
             const input_box = vscode.window.createInputBox()
             input_box.title = 'Rename Context'
@@ -284,7 +286,7 @@ export async function handle_json_file_source(
                 input_box.show()
               }
             )
-            is_showing_dialog = false
+            active_dialog_count--
 
             let name_to_highlight = item.context.name
 
@@ -374,6 +376,8 @@ export async function handle_json_file_source(
           }
 
           if (event.button === delete_button) {
+            const current_timestamp = Date.now()
+            active_deletion_timestamp = current_timestamp
             const deleted_context_name = item.context.name
 
             const roots = context_to_roots.get(deleted_context_name) || []
@@ -424,14 +428,22 @@ export async function handle_json_file_source(
             context_to_roots = reloaded.context_to_roots
             quick_pick.items = create_quick_pick_items(file_contexts)
 
-            is_showing_dialog = true
+            active_dialog_count++
             const choice = await vscode.window.showInformationMessage(
-              dictionary.information_message.DELETED_CONTEXT_FROM_ALL_ROOTS(
-                deleted_context_name
-              ),
+              dictionary.information_message.DELETED_CONTEXT_FROM_ALL_ROOTS,
               'Undo'
             )
-            is_showing_dialog = false
+            active_dialog_count--
+
+            if (active_deletion_timestamp !== current_timestamp) {
+              if (choice === 'Undo') {
+                vscode.window.showInformationMessage(
+                  'Could not undo as another context was deleted.'
+                )
+              }
+              quick_pick.show()
+              return
+            }
 
             if (choice == 'Undo') {
               let success = true
diff --git a/packages/vscode/src/commands/apply-context-command/sources/workspace-state-source.ts b/packages/vscode/src/commands/apply-context-command/sources/workspace-state-source.ts
@@ -9,6 +9,8 @@ import { Logger } from '@shared/utils/logger'
 import { dictionary } from '@shared/constants/dictionary'
 import { apply_saved_context } from '../utils'
 
+let active_deletion_timestamp: number | undefined
+
 export async function handle_workspace_state_source(
   workspace_provider: WorkspaceProvider,
   extension_context: vscode.ExtensionContext,
@@ -66,7 +68,7 @@ export async function handle_workspace_state_source(
       }
     }
 
-    let is_showing_dialog = false
+    let active_dialog_count = 0
     let go_back_after_delete = false
     const quick_pick_promise = new Promise<
       | 'back'
@@ -104,7 +106,7 @@ export async function handle_workspace_state_source(
         }),
 
         quick_pick.onDidHide(() => {
-          if (is_showing_dialog) {
+          if (active_dialog_count > 0) {
             return
           }
           if (go_back_after_delete) {
@@ -128,7 +130,7 @@ export async function handle_workspace_state_source(
           )
 
           if (event.button === edit_button) {
-            is_showing_dialog = true
+            active_dialog_count++
             const input_box = vscode.window.createInputBox()
             input_box.title = 'Rename Context'
             input_box.prompt = 'Enter new name for context'
@@ -178,7 +180,7 @@ export async function handle_workspace_state_source(
                 input_box.show()
               }
             )
-            is_showing_dialog = false
+            active_dialog_count--
 
             let name_to_highlight = item.context.name
 
@@ -221,6 +223,8 @@ export async function handle_workspace_state_source(
           }
 
           if (event.button === delete_button) {
+            const current_timestamp = Date.now()
+            active_deletion_timestamp = current_timestamp
             const deleted_context = item.context
             const deleted_context_name = item.context.name
             const deleted_index = item.index
@@ -235,14 +239,23 @@ export async function handle_workspace_state_source(
             internal_contexts = updated_contexts
             quick_pick.items = create_quick_pick_items(internal_contexts)
 
-            is_showing_dialog = true
+            active_dialog_count++
             const choice = await vscode.window.showInformationMessage(
-              dictionary.information_message.DELETED_CONTEXT_FROM_WORKSPACE_STATE(
-                deleted_context_name
-              ),
+              dictionary.information_message
+                .DELETED_CONTEXT_FROM_WORKSPACE_STATE,
               'Undo'
             )
-            is_showing_dialog = false
+            active_dialog_count--
+
+            if (active_deletion_timestamp !== current_timestamp) {
+              if (choice === 'Undo') {
+                vscode.window.showInformationMessage(
+                  'Could not undo as another context was deleted.'
+                )
+              }
+              quick_pick.show()
+              return
+            }
 
             if (choice == 'Undo') {
               internal_contexts.splice(deleted_index, 0, deleted_context)
diff --git a/packages/vscode/src/commands/save-context-command.ts b/packages/vscode/src/commands/save-context-command.ts
@@ -533,7 +533,7 @@ export function save_context_command(
                 quick_pick_contexts.title = 'Save Context'
                 quick_pick_contexts.buttons = [vscode.QuickInputButtons.Back]
 
-                let is_showing_dialog = false
+                let active_dialogs_count = 0
                 const selected_item = await new Promise<
                   vscode.QuickPickItem | 'back' | undefined
                 >((resolve) => {
@@ -611,15 +611,14 @@ export function save_context_command(
                         quick_pick_contexts.items =
                           create_quick_pick_items(all_contexts_map)
 
-                        is_showing_dialog = true
+                        active_dialogs_count++
                         const choice =
                           await vscode.window.showInformationMessage(
-                            dictionary.information_message.DELETED_CONTEXT_FROM_ALL_ROOTS(
-                              deleted_context_name
-                            ),
+                            dictionary.information_message
+                              .DELETED_CONTEXT_FROM_ALL_ROOTS,
                             'Undo'
                           )
-                        is_showing_dialog = false
+                        active_dialogs_count--
 
                         if (choice == 'Undo') {
                           for (const [
@@ -654,7 +653,7 @@ export function save_context_command(
                       quick_pick_contexts.hide()
                     }),
                     quick_pick_contexts.onDidHide(() => {
-                      if (is_showing_dialog) return
+                      if (active_dialogs_count > 0) return
                       if (!is_accepted && !did_trigger_back) {
                         resolve('back')
                       }
@@ -782,11 +781,10 @@ export function save_context_command(
           ) as SavedContext[]) {
             if (are_paths_equal(existingContext.paths, all_prefixed_paths)) {
               vscode.window.showWarningMessage(
-                dictionary.warning_message.CONTEXT_WITH_IDENTICAL_PATHS_EXISTS(
+                dictionary.warning_message.CONTEXT_ALREADY_SAVED(
                   existingContext.name
                 )
               )
-              return
             }
           }
 
@@ -839,7 +837,7 @@ export function save_context_command(
                 PLACEHOLDER_SELECT_OR_CREATE_CONTEXT
               quick_pick_contexts.title = 'Save Context'
               quick_pick_contexts.buttons = [vscode.QuickInputButtons.Back]
-              let is_showing_dialog = false
+              let active_dialogs_count = 0
               const selected_item = await new Promise<
                 vscode.QuickPickItem | 'back' | undefined
               >((resolve) => {
@@ -883,14 +881,13 @@ export function save_context_command(
                     quick_pick_contexts.items =
                       create_quick_pick_items(saved_contexts)
 
-                    is_showing_dialog = true
+                    active_dialogs_count++
                     const choice = await vscode.window.showInformationMessage(
-                      dictionary.information_message.DELETED_CONTEXT_FROM_WORKSPACE_STATE(
-                        deleted_context_name
-                      ),
+                      dictionary.information_message
+                        .DELETED_CONTEXT_FROM_WORKSPACE_STATE,
                       'Undo'
                     )
-                    is_showing_dialog = false
+                    active_dialogs_count--
 
                     if (choice == 'Undo') {
                       await extContext.workspaceState.update(
@@ -918,7 +915,7 @@ export function save_context_command(
                     quick_pick_contexts.hide()
                   }),
                   quick_pick_contexts.onDidHide(() => {
-                    if (is_showing_dialog) return
+                    if (active_dialogs_count > 0) return
                     if (!is_accepted && !did_trigger_back) {
                       resolve('back')
                     }
