feat: Add confirmation dialog for taking files (#214)

Author: Copilot

README.md

@@ -85,6 +85,8 @@ There are several ways to choose folders to compare:
 - `ignoreAllWhiteSpaces` - boolean - ignore all white space differences (similar to `diff -w`)
 - `ignoreEmptyLines` - boolean - ignore differences caused by empty lines (similar to `diff -B`)
 - `respectGitIgnore` - boolean - include / exclude files based on .gitignore - this option works together with `includeFilter` and `excludeFilter` options. ⚠️ The extension supports the main basic gitignore rules. For instance, it supports negation (`!`), but it doesn't support .gitignore files in subfolders. If there is an important use case that is not supported, please open an issue.
+- `warnBeforeDelete` - boolean - Show a warning message before deleting files
+- `warnBeforeTake` - boolean - Show a warning message before taking/replacing files  
 - `defaultDiffViewMode` - One of the options: "tree" or "list". The default view mode when vscode is opened. Later it can be toggled by the "View as list / View as tree" button
 
 ## CLI

package.json

@@ -2,7 +2,7 @@
   "name": "compare-folders",
   "displayName": "Compare Folders",
   "description": "Compare folders by contents, present the files that have differences and display the diffs side by side",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/moshfeu/vscode-compare-folders"
@@ -178,6 +178,12 @@
           "default": "true",
           "description": "Show a warning message before deleting files",
           "scope": "resource"
+        },
+        "compareFolders.warnBeforeTake": {
+          "type": "boolean",
+          "default": true,
+          "description": "Show a warning message before taking/replacing files",
+          "scope": "resource"
         }
       }
     },

src/providers/foldersCompareProvider.ts

@@ -30,7 +30,7 @@ import { getConfiguration } from '../services/configuration';
 import { setContext } from '../context/global';
 import { HAS_FOLDERS } from '../constants/contextKeys';
 import * as logger from '../services/logger';
-import { showErrorMessage, showErrorMessageWithMoreInfo, showInfoMessageWithTimeout } from '../utils/ui';
+import { showErrorMessage, showErrorMessageWithMoreInfo, showInfoMessageWithTimeout, warnBefore } from '../utils/ui';
 import { showUnaccessibleWarning } from '../services/validators';
 import { uiContext, type DiffViewMode } from '../context/ui';
 
@@ -230,35 +230,30 @@ export class CompareFoldersProvider implements TreeDataProvider<File> {
   };
 
   deleteFile = async (e: TreeItem) => {
-    const yesMessage = `Yes. I know what I'm doing`;
-    let shouldDelete = true;
-
-    if (getConfiguration('warnBeforeDelete')) {
-      shouldDelete =
-        yesMessage ===
-        (await window.showInformationMessage(
-          'Are you sure you want to delete this file?',
-          {
-            modal: true,
-          },
-          yesMessage
-        ));
-    }
+    const shouldDelete = await warnBefore('Are you sure you want to delete this file?');
 
     if (shouldDelete) {
       removeSync(e.resourceUri!.fsPath);
       this.refresh(false);
     }
   };
 
-  takeMyFile = (e: TreeItem) => {
-    const [[filePath]] = e.command!.arguments!;
-    this.copyToFolder(Uri.file(filePath), 'to-compared');
+  takeMyFile = async (e: TreeItem) => {
+    const shouldTake = await warnBefore('Are you sure you want to take my file?');
+
+    if (shouldTake) {
+      const [[filePath]] = e.command!.arguments!;
+      this.copyToFolder(Uri.file(filePath), 'to-compared');
+    }
   };
 
-  takeComparedFile = (e: TreeItem) => {
-    const [[, filePath]] = e.command!.arguments!;
-    this.copyToFolder(Uri.file(filePath), 'to-me');
+  takeComparedFile = async (e: TreeItem) => {
+    const shouldTake = await warnBefore('Are you sure you want to take the compared file?');
+
+    if (shouldTake) {
+      const [[, filePath]] = e.command!.arguments!;
+      this.copyToFolder(Uri.file(filePath), 'to-me');
+    }
   };
 
   copyToFolder(uri: Uri, direction: 'to-compared' | 'to-me') {

src/services/configuration.ts

@@ -14,6 +14,7 @@ export interface IConfigurations {
   showIdentical: boolean;
   useDiffMerge: boolean;
   warnBeforeDelete: boolean;
+  warnBeforeTake: boolean;
   folderLeft: string;
   folderRight: string;
   ignoreWhiteSpaces: boolean;

src/test/suite/includeExcludeFilesGetter/includeExcludeFilesGetter.testkit.ts

@@ -16,6 +16,7 @@ const defaultSettings: Partial<IConfigurations> = {
   showIdentical: false,
   useDiffMerge: false,
   warnBeforeDelete: false,
+  warnBeforeTake: false,
   folderLeft: undefined,
   folderRight: undefined,
   ignoreWhiteSpaces: false,

src/utils/consts.ts

@@ -1,2 +1,3 @@
 export const GLOB_ROOT = '*';
-export const GIT_FOLDER = '.git';
+export const GIT_FOLDER = '.git';
+export const YES_MESSAGE = 'Yes, go for it';

src/utils/ui.ts

@@ -2,6 +2,8 @@ import { window, ProgressLocation, env, Uri, version } from 'vscode';
 import os from 'os';
 import * as logger from '../services/logger';
 import { globalState } from '../services/globalState';
+import { getConfiguration } from '../services/configuration';
+import { YES_MESSAGE } from '../utils/consts';
 
 export function showInfoMessageWithTimeout(message: string, timeout: number = 3000) {
   const upTo = timeout / 10;
@@ -49,9 +51,8 @@ OS: ${os.platform()} ${os.release()}
 **Stack**
 ${error.stack || error.message || error}
 `;
-      const url = `https://github.com/moshfeu/vscode-compare-folders/issues/new?title=[error] ${
-        error.message || error
-      }&body=${body}`;
+      const url = `https://github.com/moshfeu/vscode-compare-folders/issues/new?title=[error] ${error.message || error
+        }&body=${body}`;
 
       const uri = Uri.parse(url);
       env.openExternal(uri);
@@ -68,3 +69,18 @@ export async function showErrorMessageWithMoreInfo(message: string, link: string
     env.openExternal(Uri.parse(link));
   }
 }
+
+export const warnBefore = async (message: string) => {
+  if (getConfiguration('warnBeforeTake')) {
+    return YES_MESSAGE ===
+      (await window.showInformationMessage(
+        message,
+        {
+          modal: true,
+        },
+        YES_MESSAGE
+      ));
+  }
+
+  return true;
+}