Merge pull request #374 from edgardmessias/delete_unversioned

feat: Added context menu to delete unversioned files (Close #364)

Author: JohnstonCode

package.json

@@ -278,6 +278,11 @@
         "command": "svn.treeview.pullIncomingChange",
         "title": "Pull selected changes",
         "category": "SVN"
+      },
+      {
+        "command": "svn.deleteUnversioned",
+        "title": "Delete selected files",
+        "category": "SVN"
       }
     ],
     "menus": {
@@ -381,6 +386,10 @@
         {
           "command": "svn.renameExplorer",
           "when": "false"
+        },
+        {
+          "command": "svn.deleteUnversioned",
+          "when": "false"
         }
       ],
       "view/title": [
@@ -538,6 +547,11 @@
           "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup != unversioned && scmResourceGroup != external && scmResourceGroup != conflicts && scmResourceGroup != remotechanged",
           "group": "2_modification"
         },
+        {
+          "command": "svn.deleteUnversioned",
+          "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
+          "group": "2_modification"
+        },
         {
           "command": "svn.addToIgnoreSCM",
           "when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",

src/commands.ts

@@ -43,6 +43,7 @@ import { Svn, svnErrorCodes } from "./svn";
 import IncomingChangeNode from "./treeView/nodes/incomingChangeNode";
 import { fromSvnUri, toSvnUri } from "./uri";
 import {
+  deleteDirectory,
   fixPathSeparator,
   hasSupportToRegisterDiffCommand,
   IDisposable
@@ -1511,6 +1512,44 @@ export class SvnCommands implements IDisposable {
     }
   }
 
+  @command("svn.deleteUnversioned")
+  public async deleteUnversioned(
+    ...resourceStates: SourceControlResourceState[]
+  ): Promise<void> {
+    const selection = this.getResourceStates(resourceStates);
+
+    if (selection.length === 0) {
+      return;
+    }
+
+    const uris = selection.map(resource => resource.resourceUri);
+
+    const answer = await window.showWarningMessage(
+      "Would you like delete the files?.",
+      { modal: true },
+      "Yes",
+      "No"
+    );
+
+    if (answer === "Yes") {
+      for (const uri of uris) {
+        const fsPath = uri.fsPath;
+
+        if (!fs.existsSync(fsPath)) {
+          continue;
+        }
+
+        const stat = fs.lstatSync(fsPath);
+
+        if (stat.isDirectory()) {
+          deleteDirectory(fsPath);
+        } else {
+          fs.unlinkSync(fsPath);
+        }
+      }
+    }
+  }
+
   private getSCMResource(uri?: Uri): Resource | undefined {
     uri = uri
       ? uri

src/util.ts

@@ -1,4 +1,5 @@
-import { sep } from "path";
+import * as fs from "fs";
+import * as path from "path";
 import { commands, Event, window } from "vscode";
 import { Operation } from "./common/types";
 
@@ -68,10 +69,10 @@ export function eventToPromise<T>(event: Event<T>): Promise<T> {
   return new Promise<T>(c => onceEvent(event)(c));
 }
 
-const regexNormalizePath = new RegExp(sep === "/" ? "\\\\" : "/", "g");
+const regexNormalizePath = new RegExp(path.sep === "/" ? "\\\\" : "/", "g");
 const regexNormalizeWindows = new RegExp("^\\\\(\\w:)", "g");
 export function fixPathSeparator(file: string) {
-  file = file.replace(regexNormalizePath, sep);
+  file = file.replace(regexNormalizePath, path.sep);
   file = file.replace(regexNormalizeWindows, "$1"); // "\t:\test" => "t:\test"
   return file;
 }
@@ -80,19 +81,19 @@ export function normalizePath(file: string) {
   file = fixPathSeparator(file);
 
   // IF Windows
-  if (sep === "\\") {
+  if (path.sep === "\\") {
     file = file.toLowerCase();
   }
 
   return file;
 }
 
 export function isDescendant(parent: string, descendant: string): boolean {
-  parent = parent.replace(/[\\\/]/g, sep);
-  descendant = descendant.replace(/[\\\/]/g, sep);
+  parent = parent.replace(/[\\\/]/g, path.sep);
+  descendant = descendant.replace(/[\\\/]/g, path.sep);
 
   // IF Windows
-  if (sep === "\\") {
+  if (path.sep === "\\") {
     parent = parent.replace(/^\\/, "").toLowerCase();
     descendant = descendant.replace(/^\\/, "").toLowerCase();
   }
@@ -101,8 +102,8 @@ export function isDescendant(parent: string, descendant: string): boolean {
     return true;
   }
 
-  if (parent.charAt(parent.length - 1) !== sep) {
-    parent += sep;
+  if (parent.charAt(parent.length - 1) !== path.sep) {
+    parent += path.sep;
   }
 
   return descendant.startsWith(parent);
@@ -161,3 +162,22 @@ export function isReadOnly(operation: Operation): boolean {
       return false;
   }
 }
+
+/**
+ * Remove directory recursively
+ * @param {string} dirPath
+ * @see https://stackoverflow.com/a/42505874/3027390
+ */
+export function deleteDirectory(dirPath: string) {
+  if (fs.existsSync(dirPath) && fs.lstatSync(dirPath).isDirectory()) {
+    fs.readdirSync(dirPath).forEach((entry: string) => {
+      const entryPath = path.join(dirPath, entry);
+      if (fs.lstatSync(entryPath).isDirectory()) {
+        deleteDirectory(entryPath);
+      } else {
+        fs.unlinkSync(entryPath);
+      }
+    });
+    fs.rmdirSync(dirPath);
+  }
+}