From c856cacfa7a660a1b8acc856260c9c886ef7a6f2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 28 Nov 2014 17:06:36 +0900
Subject: [PATCH] Better argument splitting

---
 wrap.vim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wrap.vim b/wrap.vim
index 829cd1a..f953765 100644
--- a/wrap.vim
+++ b/wrap.vim
@@ -55,13 +55,12 @@ function! ExtractText(range)
 endfunction
 
 function! UpdateScopeStack(stack, char)
-    let l:openers = {"\"": "\"", "\'": "\'", "(": ")", "[": "]", "{": "}"}
-    let l:closers = {"\"": "\"", "\'": "\'", ")": "(", "]": "[", "}": "{"}
-
+    let l:pairs  = {"\"": "\"", "\'": "\'", ")": "(", "]": "[", "}": "{"}
     let l:length = len(a:stack)
-    if l:length > 0 && get(l:closers, a:char) == a:stack[l:length - 1]
+
+    if l:length > 0 && get(l:pairs, a:char, "") == a:stack[l:length - 1]
         call remove(a:stack, l:length - 1)
-    elseif has_key(l:openers, a:char)
+    elseif index(values(l:pairs), a:char) >= 0
         call add(a:stack, a:char)
     endif
 endfunction
@@ -74,6 +73,7 @@ function! ExtractArguments(text)
     for l:index in range(strlen(a:text))
         let l:char = a:text[l:index]
         call UpdateScopeStack(l:stack, l:char)
+
         if len(l:stack) == 0 && l:char == ","
             call add(l:arguments, l:argument)
             let l:argument = ""