Improve file creation handling to automatically check new files in checked directories and optimize updates

Author: robertpiosik

packages/vscode/src/context/providers/workspace-provider.ts

@@ -500,27 +500,82 @@ export class WorkspaceProvider
     // Update the file to workspace mapping
     this.update_file_workspace_mapping()
 
-    // Refresh the tree view
+    // Refresh the tree view first to update its structure
     await this.refresh()
 
-    // If a new file is created within a checked directory, check it automatically
-    for (const [dir_path] of this.checked_items) {
-      if (
-        this.checked_items.get(dir_path) == vscode.TreeItemCheckboxState.Checked
-      ) {
-        const workspace_root = this.get_workspace_root_for_file(dir_path)
-        if (!workspace_root) continue
+    let internal_check_state_changed = false
+    // Take a snapshot of the checked items before potential modifications
+    const initial_checked_items_state = new Map(this.checked_items.entries())
+
+    // If a new file is created within a checked directory, it should also be checked (if not excluded).
+    // Iterate over a snapshot of items that were checked BEFORE this method's logic began fully.
+    for (const [item_path_key, item_state_val] of initial_checked_items_state) {
+      if (item_state_val === vscode.TreeItemCheckboxState.Checked) {
+        // We are interested if item_path_key is a directory that could contain created_file_path,
+        // or if created_file_path is null (less specific), we re-evaluate all checked directories.
+        let needs_re_evaluation = false
+        try {
+          if (
+            fs.existsSync(item_path_key) &&
+            fs.lstatSync(item_path_key).isDirectory()
+          ) {
+            if (created_file_path) {
+              // Only process if item_path_key is a parent (or ancestor) of created_file_path
+              if (created_file_path.startsWith(item_path_key + path.sep)) {
+                needs_re_evaluation = true
+              }
+            } else {
+              needs_re_evaluation = true // No specific file, re-evaluate all checked dirs
+            }
+          }
+        } catch (e) {
+          /* item_path_key might not be a dir or might be gone */
+        }
 
-        const relative_path = path.relative(workspace_root, dir_path)
-        const is_excluded = this.is_excluded(relative_path)
+        if (needs_re_evaluation) {
+          const workspace_root = this.get_workspace_root_for_file(item_path_key)
+          if (!workspace_root) continue
 
-        await this.update_directory_check_state(
-          dir_path,
-          vscode.TreeItemCheckboxState.Checked,
-          is_excluded
-        )
+          const relative_path = path.relative(workspace_root, item_path_key)
+          const is_excluded = this.is_excluded(relative_path)
+
+          // This call directly modifies `this.checked_items` for children of item_path_key.
+          await this.update_directory_check_state(
+            item_path_key,
+            vscode.TreeItemCheckboxState.Checked,
+            is_excluded
+          )
+        }
       }
     }
+
+    // After potential modifications, check if the actual state of `this.checked_items` has changed.
+    if (this.checked_items.size !== initial_checked_items_state.size) {
+      internal_check_state_changed = true
+    } else {
+      for (const [key, value] of this.checked_items) {
+        if (initial_checked_items_state.get(key) !== value) {
+          internal_check_state_changed = true
+          break
+        }
+      }
+      // Also check if any keys were removed from initial_checked_items_state but not present in this.checked_items
+      if (!internal_check_state_changed) {
+        for (const key of initial_checked_items_state.keys()) {
+          if (!this.checked_items.has(key)) {
+            internal_check_state_changed = true
+            break
+          }
+        }
+      }
+    }
+
+    if (internal_check_state_changed) {
+      this._on_did_change_checked_files.fire()
+      // Refresh again if this provider's UI also needs to reflect the new check states.
+      // This ensures consistency within this provider's view.
+      await this.refresh()
+    }
   }
 
   async refresh(): Promise<void> {