Refine file handling logic to prevent automatic deletion of empty files and enable parsing of files containing only comments or whitespace

Author: robertpiosik

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

@@ -184,8 +184,10 @@ export const apply_chat_response_command = (params: {
               }
 
               let current_content = ''
+              let file_exists = false
               try {
                 if (fs.existsSync(sanitized_file_path)) {
+                  file_exists = true
                   const document =
                     await vscode.workspace.openTextDocument(sanitized_file_path)
                   current_content = document.getText()
@@ -205,9 +207,7 @@ export const apply_chat_response_command = (params: {
               total_lines_removed += diff_stats.lines_removed
 
               const is_deleted =
-                state.file_state != 'new' &&
-                current_content == '' &&
-                state.content != ''
+                state.file_state != 'new' && !file_exists && state.content != ''
 
               files_for_history.push({
                 type: 'file',

packages/vscode/src/commands/apply-chat-response-command/handlers/conflict-markers-handler.ts

@@ -102,9 +102,7 @@ export const handle_conflict_markers = async (
               file.content
             )
           } else {
-            if (file.content !== '') {
-              new_content = file.content
-            }
+            new_content = file.content
           }
 
           const tabs_to_close: vscode.Tab[] = []
@@ -129,31 +127,21 @@ export const handle_conflict_markers = async (
             workspace_root
           })
 
-          if (new_content.trim() == '') {
-            original_states.push({
-              file_path: file.file_path,
-              content: rename_source_content,
-              workspace_name: file.workspace_name,
-              file_path_to_restore: file.renamed_from,
-              file_state: 'deleted'
-            })
-          } else {
-            const directory = path.dirname(safe_path)
-            if (!fs.existsSync(directory)) {
-              await fs.promises.mkdir(directory, { recursive: true })
-            }
-            await vscode.workspace.fs.writeFile(
-              vscode.Uri.file(safe_path),
-              Buffer.from(new_content, 'utf8')
-            )
-
-            original_states.push({
-              file_path: file.file_path,
-              content: rename_source_content,
-              workspace_name: file.workspace_name,
-              file_path_to_restore: file.renamed_from
-            })
+          const directory = path.dirname(safe_path)
+          if (!fs.existsSync(directory)) {
+            await fs.promises.mkdir(directory, { recursive: true })
           }
+          await vscode.workspace.fs.writeFile(
+            vscode.Uri.file(safe_path),
+            Buffer.from(new_content, 'utf8')
+          )
+
+          original_states.push({
+            file_path: file.file_path,
+            content: rename_source_content,
+            workspace_name: file.workspace_name,
+            file_path_to_restore: file.renamed_from
+          })
         } catch (error) {
           failed_files.push(file)
         }
@@ -166,50 +154,19 @@ export const handle_conflict_markers = async (
             file.content
           )
 
-          if (current_content.trim() == '') {
-            const tabs_to_close: vscode.Tab[] = []
-            for (const tab_group of vscode.window.tabGroups.all) {
-              tabs_to_close.push(
-                ...tab_group.tabs.filter((tab) => {
-                  const tab_uri = (tab.input as any)?.uri as
-                    | vscode.Uri
-                    | undefined
-                  return tab_uri && tab_uri.fsPath === safe_path
-                })
-              )
-            }
-
-            if (tabs_to_close.length > 0) {
-              await vscode.window.tabGroups.close(tabs_to_close)
-            }
-
-            await vscode.workspace.fs.delete(vscode.Uri.file(safe_path))
-            await remove_directory_if_empty({
-              dir_path: path.dirname(safe_path),
-              workspace_root
-            })
-
-            original_states.push({
-              file_path: file.file_path,
-              content: original_content,
-              workspace_name: file.workspace_name,
-              file_state: 'deleted'
-            })
-          } else {
-            if (current_content !== original_content) {
-              await vscode.workspace.fs.writeFile(
-                vscode.Uri.file(safe_path),
-                Buffer.from(current_content, 'utf8')
-              )
-            }
-
-            original_states.push({
-              file_path: file.file_path,
-              content: original_content,
-              workspace_name: file.workspace_name
-            })
+          if (current_content !== original_content) {
+            await vscode.workspace.fs.writeFile(
+              vscode.Uri.file(safe_path),
+              Buffer.from(current_content, 'utf8')
+            )
           }
 
+          original_states.push({
+            file_path: file.file_path,
+            content: original_content,
+            workspace_name: file.workspace_name
+          })
+
           Logger.info({
             function_name: 'handle_conflict_markers',
             message: 'Applied conflict markers edit to file',
@@ -224,16 +181,6 @@ export const handle_conflict_markers = async (
           failed_files.push(file)
         }
       } else if (!file_exists) {
-        if (file.content == '') {
-          original_states.push({
-            file_path: file.file_path,
-            content: '',
-            file_state: 'new',
-            workspace_name: file.workspace_name
-          })
-          continue
-        }
-
         try {
           const directory = path.dirname(safe_path)
           if (!fs.existsSync(directory)) {
@@ -270,61 +217,30 @@ export const handle_conflict_markers = async (
           const document = await vscode.workspace.openTextDocument(safe_path)
           const original_content = document.getText()
 
-          if (file.content.trim() == '') {
-            const tabs_to_close: vscode.Tab[] = []
-            for (const tab_group of vscode.window.tabGroups.all) {
-              tabs_to_close.push(
-                ...tab_group.tabs.filter((tab) => {
-                  const tab_uri = (tab.input as any)?.uri as
-                    | vscode.Uri
-                    | undefined
-                  return tab_uri && tab_uri.fsPath === safe_path
-                })
-              )
-            }
-
-            if (tabs_to_close.length > 0) {
-              await vscode.window.tabGroups.close(tabs_to_close)
-            }
-
-            await vscode.workspace.fs.delete(vscode.Uri.file(safe_path))
-            await remove_directory_if_empty({
-              dir_path: path.dirname(safe_path),
-              workspace_root
-            })
-
-            original_states.push({
-              file_path: file.file_path,
-              content: original_content,
-              workspace_name: file.workspace_name,
-              file_state: 'deleted'
-            })
-          } else {
-            const editor = await vscode.window.showTextDocument(document)
-            let final_content = file.content
-            if (
-              original_content.endsWith('\n') &&
-              !final_content.endsWith('\n')
-            ) {
-              final_content += '\n'
-            }
-            await editor.edit((edit) => {
-              edit.replace(
-                new vscode.Range(
-                  document.positionAt(0),
-                  document.positionAt(document.getText().length)
-                ),
-                final_content
-              )
-            })
-            await document.save()
-
-            original_states.push({
-              file_path: file.file_path,
-              content: original_content,
-              workspace_name: file.workspace_name
-            })
+          const editor = await vscode.window.showTextDocument(document)
+          let final_content = file.content
+          if (
+            original_content.endsWith('\n') &&
+            !final_content.endsWith('\n')
+          ) {
+            final_content += '\n'
           }
+          await editor.edit((edit) => {
+            edit.replace(
+              new vscode.Range(
+                document.positionAt(0),
+                document.positionAt(document.getText().length)
+              ),
+              final_content
+            )
+          })
+          await document.save()
+
+          original_states.push({
+            file_path: file.file_path,
+            content: original_content,
+            workspace_name: file.workspace_name
+          })
         } catch (error: any) {
           Logger.error({
             function_name: 'handle_conflict_markers',

packages/vscode/src/commands/apply-chat-response-command/handlers/diff-handler.ts

@@ -237,43 +237,7 @@ async function process_modified_files(
       continue
     }
 
-    if (fs.existsSync(safe_path)) {
-      const document = await vscode.workspace.openTextDocument(safe_path)
-      if (document.getText().trim() == '') {
-        try {
-          const uri = vscode.Uri.file(safe_path)
-          const text_editors = vscode.window.visibleTextEditors.filter(
-            (editor) => editor.document.uri.toString() == uri.toString()
-          )
-          for (const editor of text_editors) {
-            await vscode.window.showTextDocument(editor.document, {
-              preview: false,
-              preserveFocus: false
-            })
-            await vscode.commands.executeCommand(
-              'workbench.action.closeActiveEditor'
-            )
-          }
-
-          fs.unlinkSync(safe_path)
-          Logger.info({
-            function_name: 'process_modified_files',
-            message: 'File was empty after patch, removed from disk.',
-            data: { file_path }
-          })
-          await remove_directory_if_empty({
-            dir_path: path.dirname(safe_path),
-            workspace_root: workspace_path
-          })
-        } catch (error) {
-          Logger.error({
-            function_name: 'process_modified_files',
-            message: 'Error deleting empty file',
-            data: { file_path, error }
-          })
-        }
-      }
-    } else {
+    if (!fs.existsSync(safe_path)) {
       Logger.info({
         function_name: 'process_modified_files',
         message: