Merge pull request #238 from edgardmessias/ignore_extension

Added support to ignoring files by ext Close #234)

Author: JohnstonCode

package.json

@@ -212,8 +212,13 @@
         "category": "SVN"
       },
       {
-        "command": "svn.addFileToIgnore",
-        "title": "Ignore",
+        "command": "svn.addToIgnoreSCM",
+        "title": "Ignore file/ext from SVN (svn:ignore)",
+        "category": "SVN"
+      },
+      {
+        "command": "svn.addToIgnoreExplorer",
+        "title": "Ignore file/ext from SVN (svn:ignore)",
         "category": "SVN"
       }
     ],
@@ -311,7 +316,7 @@
           "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
         },
         {
-          "command": "svn.addFileToIgnore",
+          "command": "svn.addToIgnoreExplorer",
           "when": "false"
         }
       ],
@@ -449,7 +454,7 @@
           "group": "2_modification"
         },
         {
-          "command": "svn.addFileToIgnore",
+          "command": "svn.addToIgnoreSCM",
           "when":
             "config.svn.enabled && scmProvider == svn && scmResourceGroup == unversioned",
           "group": "1_modification"
@@ -486,6 +491,13 @@
           "when":
             "config.svn.enabled && svnOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme != merge-conflicts.conflicts-diff && && svnHasSupportToRegisterDiffCommand == 1"
         }
+      ],
+      "explorer/context": [
+        {
+          "command": "svn.addToIgnoreExplorer",
+          "group": "9_svn",
+          "when": "config.svn.enabled && svnOpenRepositoryCount != 0"
+        }
       ]
     },
     "configuration": {

src/commands.ts

@@ -36,6 +36,7 @@ import {
 } from "./changelistItems";
 import { configuration } from "./helpers/configuration";
 import { selectBranch } from "./branches";
+import { inputIgnoreList } from "./ignoreitems";
 
 interface CommandOptions {
   repository?: boolean;
@@ -1055,7 +1056,7 @@ export class SvnCommands implements IDisposable {
     await repository.finishCheckout();
   }
 
-  @command("svn.addFileToIgnore")
+  @command("svn.addToIgnoreSCM")
   async addFileToIgnore(
     ...resourceStates: SourceControlResourceState[]
   ): Promise<void> {
@@ -1067,22 +1068,31 @@ export class SvnCommands implements IDisposable {
 
     const uris = selection.map(resource => resource.resourceUri);
 
+    return await this.addToIgnore(uris);
+  }
+
+  @command("svn.addToIgnoreExplorer")
+  async addToIgnoreExplorer(mainUri?: Uri, allUris?: Uri[]): Promise<void> {
+    if (!allUris || allUris.length === 0) {
+      return;
+    }
+
+    return await this.addToIgnore(allUris);
+  }
+
+  async addToIgnore(uris: Uri[]): Promise<void> {
     await this.runByRepository(uris, async (repository, resources) => {
       if (!repository) {
         return;
       }
 
-      for (const resource of resources) {
-        try {
-          await repository.addFileToIgnore(resource.fsPath);
-
-          const assetName = path.basename(resource.fsPath);
+      try {
+        await inputIgnoreList(repository, resources);
 
-          window.showInformationMessage(`${assetName} is now being ignored`);
-        } catch (error) {
-          console.log(error);
-          window.showErrorMessage("Unable to set property ignore");
-        }
+        window.showInformationMessage(`File(s) is now being ignored`);
+      } catch (error) {
+        console.log(error);
+        window.showErrorMessage("Unable to set property ignore");
       }
     });
   }

src/ignoreitems.ts

@@ -0,0 +1,111 @@
+import {
+  QuickPickItem,
+  SourceControlResourceGroup,
+  window,
+  workspace,
+  Uri
+} from "vscode";
+import { Repository } from "./repository";
+import { configuration } from "./helpers/configuration";
+import * as path from "path";
+import { Status } from "./svn";
+
+export class IgnoreSingleItem implements QuickPickItem {
+  constructor(public expression: string, public recursive: boolean = false) {}
+
+  get label(): string {
+    const r_text = this.recursive ? " (Recursive)" : "";
+    return `${this.expression}${r_text}`;
+  }
+
+  get description(): string {
+    const r_text = this.recursive ? " (Recursive)" : "";
+    return `Add '${this.expression}' to 'svn:ignore'${r_text}`;
+  }
+}
+
+export async function inputIgnoreList(repository: Repository, uris: Uri[]) {
+  if (uris.length === 0) {
+    return;
+  }
+
+  const regexExtension = new RegExp("\\.[^\\.]+(\\.map)?$", "i");
+
+  if (uris.length === 1) {
+    const uri = uris[0];
+    const matchExt = uri.fsPath.match(regexExtension);
+    const ext = matchExt && matchExt[0] ? matchExt[0] : "";
+    const fileName = path.basename(uri.fsPath);
+    const dirName = path.dirname(uri.fsPath);
+
+    const picks: IgnoreSingleItem[] = [];
+    picks.push(new IgnoreSingleItem(fileName));
+    if (ext) {
+      picks.push(new IgnoreSingleItem("*" + ext));
+    }
+    picks.push(new IgnoreSingleItem(fileName, true));
+    if (ext) {
+      picks.push(new IgnoreSingleItem("*" + ext, true));
+    }
+
+    const pick = await window.showQuickPick(picks);
+
+    if (!pick) {
+      return;
+    }
+
+    return await repository.addToIgnore(
+      [pick.expression],
+      dirName,
+      pick.recursive
+    );
+  }
+
+  const count = uris.length;
+  const recursive = "(Recursive)";
+
+  const ignoreByFileName = `Ignore ${count} by filename`;
+  const ignoreByExtension = `Ignore ${count} by extension`;
+  const ignoreByFileNameRecursive = `Ignore ${count} by filename ${recursive}`;
+  const ignoreByExtensionRecursive = `Ignore ${count} by extension ${recursive}`;
+
+  const picks: string[] = [
+    ignoreByFileName,
+    ignoreByExtension,
+    ignoreByFileNameRecursive,
+    ignoreByExtensionRecursive
+  ];
+
+  const pick = await window.showQuickPick(picks);
+
+  if (!pick) {
+    return;
+  }
+
+  const isByFile = pick.startsWith(ignoreByFileName);
+  const isRecursive = pick.endsWith(recursive);
+
+  const byDir: { [key: string]: string[] } = {};
+
+  for (const uri of uris) {
+    const dirname = path.dirname(uri.fsPath);
+    const filename = path.basename(uri.fsPath);
+    const matchExt = uri.fsPath.match(regexExtension);
+    const ext = matchExt && matchExt[0] ? matchExt[0] : "";
+
+    if (typeof byDir[dirname] === "undefined") {
+      byDir[dirname] = [];
+    }
+
+    if (isByFile) {
+      byDir[dirname].push(filename);
+    } else if (ext) {
+      byDir[dirname].push("*" + ext);
+    }
+  }
+
+  for (const dir in byDir) {
+    const files = [...new Set(byDir[dir])]; // Unique list
+    await repository.addToIgnore(files, dir, isRecursive);
+  }
+}

src/repository.ts

@@ -696,9 +696,13 @@ export class Repository {
     );
   }
 
-  async addFileToIgnore(filePath: string) {
+  async addToIgnore(
+    expressions: string[],
+    directory: string,
+    recursive: boolean = false
+  ) {
     return await this.run(Operation.Ignore, () =>
-      this.repository.addFileToIgnore(filePath)
+      this.repository.addToIgnore(expressions, directory, recursive)
     );
   }
 

src/svnRepository.ts

@@ -405,33 +405,55 @@ export class Repository {
     return parseSvnList(result.stdout);
   }
 
-  async addFileToIgnore(filePath: string) {
-    const fileName = path.basename(filePath);
-    const parentDir = path.dirname(filePath);
+  async getCurrentIgnore(directory: string) {
+    directory = this.removeAbsolutePath(directory);
+
     let currentIgnore = "";
 
     try {
-      const currentIgnoreResult = await this.exec([
-        "propget",
-        "svn:ignore",
-        parentDir
-      ]);
+      const args = ["propget", "svn:ignore"];
+
+      if (directory) {
+        args.push(directory);
+      }
+
+      const currentIgnoreResult = await this.exec(args);
 
       currentIgnore = currentIgnoreResult.stdout.trim();
     } catch (error) {}
 
     const ignores = currentIgnore.split(/[\r\n]+/);
 
-    ignores.push(fileName);
+    return ignores;
+  }
 
-    const newIgnore = ignores.sort().join("\n");
+  async addToIgnore(
+    expressions: string[],
+    directory: string,
+    recursive: boolean = false
+  ) {
+    const ignores = await this.getCurrentIgnore(directory);
 
-    const result = await this.exec([
-      "propset",
-      "svn:ignore",
-      newIgnore,
-      parentDir
-    ]);
+    directory = this.removeAbsolutePath(directory);
+
+    ignores.push(...expressions);
+    const newIgnore = [...new Set(ignores)]
+      .filter(v => !!v)
+      .sort()
+      .join("\n");
+
+    const args = ["propset", "svn:ignore", newIgnore];
+
+    if (directory) {
+      args.push(directory);
+    } else {
+      args.push(".");
+    }
+    if (recursive) {
+      args.push("--recursive");
+    }
+
+    const result = await this.exec(args);
 
     return result.stdout;
   }