From a0f51bd5a6514632bf3d2df1b001df27361892bd Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 25 Oct 2019 21:44:37 +0300
Subject: [PATCH] Arrange (u)ctag argument order to not clobber others (#560)

---
 autoload/tagbar.vim | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 1c3a88b..813c40b 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -1100,6 +1100,14 @@ function! s:ExecuteCtagsOnFile(fname, realfname, typeinfo) abort
                 call add(ctags_args, '--options='.value)
             endfor
         endif
+
+        " universal-ctags deprecated this argument name
+        if s:ctags_is_uctags
+            let ctags_args += [ '--extras=' ]
+        else
+            let ctags_args += [ '--extra=' ]
+        endif
+
         let ctags_args  = ctags_args + [
                           \ '-f',
                           \ '-',
@@ -1111,13 +1119,6 @@ function! s:ExecuteCtagsOnFile(fname, realfname, typeinfo) abort
                           \ '--append=no'
                           \ ]
 
-        " universal-ctags deprecated this argument name
-        if s:ctags_is_uctags
-            let ctags_args += [ '--extras=' ]
-        else
-            let ctags_args += [ '--extra=' ]
-        endif
-
         " verbose if debug enabled
         if tagbar#debug#enabled()
             let ctags_args += [ '-V' ]