Fix misplaced whitespace in output

diff --git a/lib/Docvim/Printer/Vim.hs b/lib/Docvim/Printer/Vim.hs
index 9afe376374563c7dec1d1c11c8a9aa6d06574387..c4e7baff3ac05d497e7aec83fe8b5fdff5746044 100644 (file)
--- a/lib/Docvim/Printer/Vim.hs
+++ b/lib/Docvim/Printer/Vim.hs
@@ -198,11 +198,11 @@ listitem l = do
 option :: Node -> Env
 option (OptionAnnotation n t d) = do
   targets <- linkTargets [n] True
-  ws <- appendNoWrap " " -- no echoed...
   opt <- appendNoWrap $ link n
+  ws <- appendNoWrap " " -- no echoed...
   context <- get
   meta <- appendNoWrap $ aligned context
-  return $ concat [targets, ws, opt, meta]
+  return $ concat [targets, opt, ws, meta]
   where
     aligned context = rightAlign context rhs
     rhs = t ++ " (default: " ++ fromMaybe "none" d ++ ")\n\n"

diff --git a/tests/fixtures/vim/integration-ferret-ftplugin-qf.golden b/tests/fixtures/vim/integration-ferret-ftplugin-qf.golden
index b79b7b4ef92d628a15c3bb6c49cbff156e20bae5..e0981e8722e48d2387a3963a888cf583eaf7f5ec 100644 (file)
--- a/tests/fixtures/vim/integration-ferret-ftplugin-qf.golden
+++ b/tests/fixtures/vim/integration-ferret-ftplugin-qf.golden
@@ -1,5 +1,5 @@
                                                           *g:FerretQFOptions*
- |g:FerretQFOptions|                                    boolean (default: 1)
+|g:FerretQFOptions|                                     boolean (default: 1)
 
 Controls whether to set up setting overrides for |quickfix| windows. These
 are various settings, such as |norelativenumber|, |nolist| and |nowrap|,
@@ -14,7 +14,7 @@ to 0:
     let g:FerretQFOptions=0
 <
                                                               *g:FerretQFMap*
- |g:FerretQFMap|                                        boolean (default: 1)
+|g:FerretQFMap|                                         boolean (default: 1)
 
 Controls whether to set up mappings in the |quickfix| results window for
 deleting results. The mappings include:

diff --git a/tests/fixtures/vim/integration-ferret-plugin.golden b/tests/fixtures/vim/integration-ferret-plugin.golden
index 73210f1e7a160a18d2ab5b1d2ce516c4d0cacb36..673bfd1b4fcfe287d735dbae45925a77f3f07acb 100644 (file)
--- a/tests/fixtures/vim/integration-ferret-plugin.golden
+++ b/tests/fixtures/vim/integration-ferret-plugin.golden
@@ -186,7 +186,7 @@ in your |.vimrc| instead using |:nmap|:
     nmap <leader>u <Plug>(FerretAcks)
 <
                                                                 *g:FerretMap*
- |g:FerretMap|                                          boolean (default: 1)
+|g:FerretMap|                                           boolean (default: 1)
 
 Controls whether to set up the Ferret mappings, such as |<Plug>(FerretAck)|
 (see |ferret-mappings| for a full list). To prevent any mapping from being
@@ -195,7 +195,7 @@ configured, set to 0:
     let g:FerretMap=0
 <
                                                          *g:FerretQFCommands*
- |g:FerretQFCommands|                                   boolean (default: 1)
+|g:FerretQFCommands|                                    boolean (default: 1)
 
 Controls whether to set up custom versions of the |quickfix| commands,
 |:cn|, |:cnf|, |:cp| an |:cpf|. These overrides vertically center the match

diff --git a/tests/fixtures/vim/integration-ferret-private.golden b/tests/fixtures/vim/integration-ferret-private.golden
index e2ed73f633f75cf784e187d61960e134c242841a..17be25b09e7ec0220f3286447b44c56697cc699f 100644 (file)
--- a/tests/fixtures/vim/integration-ferret-private.golden
+++ b/tests/fixtures/vim/integration-ferret-private.golden
@@ -1,5 +1,5 @@
                                                            *g:FerretDispatch*
- |g:FerretDispatch|                                     boolean (default: 1)
+|g:FerretDispatch|                                      boolean (default: 1)
 
 Controls whether to use vim-dispatch (and specifically, |:Make|) to run
 |:Ack| searches asynchronously, when available. To prevent vim-dispatch from

diff --git a/tests/fixtures/vim/options.golden b/tests/fixtures/vim/options.golden
index 8cd1ada51bbad16d70a9070d0cdb44f12246f9fc..51918b3b12e92e7fb3a9829ea0764ceaef280853 100644 (file)
--- a/tests/fixtures/vim/options.golden
+++ b/tests/fixtures/vim/options.golden
@@ -1,14 +1,14 @@
                                                                       *g:Foo*
- |g:Foo|                                             string (default: "foo")
+|g:Foo|                                              string (default: "foo")
 
 Controls the foo factor.
 
                                                                      *g:Temp*
- |g:Temp|                                               number (default: 10)
+|g:Temp|                                                number (default: 10)
 
 Temperature control.
 
                                                                       *g:Bar*
- |g:Bar|                                              string (default: none)
+|g:Bar|                                               string (default: none)
 
 No default on this one.