Merge pull request #278 from JohnstonCode/277

removed unnecessary awaits

Author: JohnstonCode

src/branches.ts

@@ -126,14 +126,14 @@ export async function selectBranch(
   }
 
   if (choice instanceof ParentFolderItem) {
-    return await selectBranch(repository, allowNew, choice.path);
+    return selectBranch(repository, allowNew, choice.path);
   }
   if (choice instanceof FolderItem) {
     if (choice.branch) {
       return choice.branch;
     }
 
-    return await selectBranch(repository, allowNew, choice.path);
+    return selectBranch(repository, allowNew, choice.path);
   }
 
   if (choice instanceof NewFolderItem) {

src/commands.ts

@@ -440,7 +440,7 @@ export class SvnCommands implements IDisposable {
       path: path.join(basedir, `(HEAD) ${basename}`) // change document title
     });
 
-    return await commands.executeCommand<void>("vscode.open", uri, {
+    return commands.executeCommand<void>("vscode.open", uri, {
       preview: true
     });
   }
@@ -546,10 +546,10 @@ export class SvnCommands implements IDisposable {
     }
 
     if (!left) {
-      return await commands.executeCommand<void>("vscode.open", right, opts);
+      return commands.executeCommand<void>("vscode.open", right, opts);
     }
 
-    return await commands.executeCommand<void>(
+    return commands.executeCommand<void>(
       "vscode.diff",
       left,
       right,
@@ -1078,7 +1078,7 @@ export class SvnCommands implements IDisposable {
 
     const uris = selection.map(resource => resource.resourceUri);
 
-    return await this.addToIgnore(uris);
+    return this.addToIgnore(uris);
   }
 
   @command("svn.addToIgnoreExplorer")
@@ -1087,7 +1087,7 @@ export class SvnCommands implements IDisposable {
       return;
     }
 
-    return await this.addToIgnore(allUris);
+    return this.addToIgnore(allUris);
   }
 
   async addToIgnore(uris: Uri[]): Promise<void> {
@@ -1115,7 +1115,7 @@ export class SvnCommands implements IDisposable {
 
     const oldName = mainUri.fsPath;
 
-    return await this.rename(repository, oldName);
+    return this.rename(repository, oldName);
   }
 
   @command("svn.rename", { repository: true })

src/decorators.ts

@@ -86,7 +86,7 @@ function _sequentialize<T>(fn: Function, key: string): Function {
   return function(...args: any[]) {
     const currentPromise =
       (this[currentKey] as Promise<any>) || Promise.resolve(null);
-    const run = async () => await fn.apply(this, args);
+    const run = async () => fn.apply(this, args);
     this[currentKey] = currentPromise.then(run, run);
     return this[currentKey];
   };

src/ignoreitems.ts

@@ -54,11 +54,7 @@ export async function inputIgnoreList(repository: Repository, uris: Uri[]) {
       return;
     }
 
-    return await repository.addToIgnore(
-      [pick.expression],
-      dirName,
-      pick.recursive
-    );
+    return repository.addToIgnore([pick.expression], dirName, pick.recursive);
   }
 
   const count = uris.length;

src/repository.ts

@@ -619,29 +619,29 @@ export class Repository {
   }
 
   async addFiles(files: string[]) {
-    return await this.run(Operation.Add, () => this.repository.addFiles(files));
+    return this.run(Operation.Add, () => this.repository.addFiles(files));
   }
 
   async addChangelist(files: string[], changelist: string) {
-    return await this.run(Operation.AddChangelist, () =>
+    return this.run(Operation.AddChangelist, () =>
       this.repository.addChangelist(files, changelist)
     );
   }
 
   async removeChangelist(files: string[]) {
-    return await this.run(Operation.RemoveChangelist, () =>
+    return this.run(Operation.RemoveChangelist, () =>
       this.repository.removeChangelist(files)
     );
   }
 
   async getCurrentBranch() {
-    return await this.run(Operation.CurrentBranch, async () => {
+    return this.run(Operation.CurrentBranch, async () => {
       return this.repository.getCurrentBranch();
     });
   }
 
   async branch(name: string) {
-    return await this.run(Operation.NewBranch, async () => {
+    return this.run(Operation.NewBranch, async () => {
       await this.repository.branch(name);
       this.updateNewCommits();
     });
@@ -655,57 +655,55 @@ export class Repository {
   }
 
   async updateRevision(ignoreExternals: boolean = false): Promise<string> {
-    return await this.run<string>(Operation.Update, async () => {
+    return this.run<string>(Operation.Update, async () => {
       const response = await this.repository.update(ignoreExternals);
       this.updateNewCommits();
       return response;
     });
   }
 
   async resolve(files: string[], action: string) {
-    return await this.run(Operation.Resolve, () =>
+    return this.run(Operation.Resolve, () =>
       this.repository.resolve(files, action)
     );
   }
 
   async commitFiles(message: string, files: any[]) {
-    return await this.run(Operation.Commit, () =>
+    return this.run(Operation.Commit, () =>
       this.repository.commitFiles(message, files)
     );
   }
 
   async revert(files: string[]) {
-    return await this.run(Operation.Revert, () =>
-      this.repository.revert(files)
-    );
+    return this.run(Operation.Revert, () => this.repository.revert(files));
   }
 
   async patch(files: string[]) {
-    return await this.run(Operation.Patch, () => this.repository.patch(files));
+    return this.run(Operation.Patch, () => this.repository.patch(files));
   }
 
   async patchChangelist(changelistName: string) {
-    return await this.run(Operation.Patch, () =>
+    return this.run(Operation.Patch, () =>
       this.repository.patchChangelist(changelistName)
     );
   }
 
   async removeFiles(files: any[], keepLocal: boolean) {
-    return await this.run(Operation.Remove, () =>
+    return this.run(Operation.Remove, () =>
       this.repository.removeFiles(files, keepLocal)
     );
   }
 
   async log() {
-    return await this.run(Operation.Log, () => this.repository.log());
+    return this.run(Operation.Log, () => this.repository.log());
   }
 
   async cleanup() {
-    return await this.run(Operation.CleanUp, () => this.repository.cleanup());
+    return this.run(Operation.CleanUp, () => this.repository.cleanup());
   }
 
   async finishCheckout() {
-    return await this.run(Operation.SwitchBranch, () =>
+    return this.run(Operation.SwitchBranch, () =>
       this.repository.finishCheckout()
     );
   }
@@ -715,21 +713,21 @@ export class Repository {
     directory: string,
     recursive: boolean = false
   ) {
-    return await this.run(Operation.Ignore, () =>
+    return this.run(Operation.Ignore, () =>
       this.repository.addToIgnore(expressions, directory, recursive)
     );
   }
 
   async rename(oldFile: string, newFile: string) {
-    return await this.run(Operation.Rename, () =>
+    return this.run(Operation.Rename, () =>
       this.repository.rename(oldFile, newFile)
     );
   }
 
   async promptAuth(): Promise<boolean | undefined> {
     // Prevent multiple prompts for auth
     if (this.lastPromptAuth) {
-      return await this.lastPromptAuth;
+      return this.lastPromptAuth;
     }
 
     this.lastPromptAuth = commands.executeCommand("svn.promptAuth");

src/svnRepository.ts

@@ -29,7 +29,7 @@ export class Repository {
     options.username = this.username;
     options.password = this.password;
 
-    return await this.svn.exec(this.workspaceRoot, args, options);
+    return this.svn.exec(this.workspaceRoot, args, options);
   }
 
   removeAbsolutePath(file: string) {