From 2c839446fee75a81d474faca6373cf81a2ed275c Mon Sep 17 00:00:00 2001
From: Tae Won Ha <h@taewon.de>
Date: Fri, 18 Nov 2016 08:40:01 +0100
Subject: [PATCH] GH-296 Refactor slightly

---
 VimR/Workspace/WorkspaceBar.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/VimR/Workspace/WorkspaceBar.swift b/VimR/Workspace/WorkspaceBar.swift
index f2a8fd47..66391456 100644
--- a/VimR/Workspace/WorkspaceBar.swift
+++ b/VimR/Workspace/WorkspaceBar.swift
@@ -333,11 +333,11 @@ extension ProxyBar {
 
     // 2.
     if draggedOnToolIdx > toolIdx {
-      (toolIdx..<draggedOnToolIdx).forEach { swap(&self.container!.tools[$0], &self.container!.tools[$0 + 1]) }
+      self.container!.tools.remove(at: toolIdx)
+      self.container!.tools.insert(tool, at: draggedOnToolIdx - 1)
     } else {
-      (draggedOnToolIdx..<toolIdx).reversed().forEach {
-        swap(&self.container!.tools[$0 + 1], &self.container!.tools[$0])
-      }
+      self.container!.tools.remove(at: toolIdx)
+      self.container!.tools.insert(tool, at: draggedOnToolIdx)
     }
     return true
   }