Add group_dicts_together_option (#192)

* Add which_key_group_dicts_together option

Make separating single key (leaves) and dicts mappings configurable.
Also add an option to configure what is shown first leaves or dicts.

* Add docs for which_key_group_dicts_together option

* Combine group_dicts_at and group_dicts_together

As suggested in PR, combined two bool options into one of a type string
And updated docs.

* Change tabs to spaces

Close #191

autoload/which_key/renderer.vim

@@ -94,17 +94,30 @@ function! s:create_rows(layout, mappings) abort
   let row = 0
   let col = 0
 
-  let leaf_keys = []
-  let dict_keys = []
-  for key in sort(filter(keys(mappings), 'v:val !=# "name"'), 'i')
-    if type(mappings[key]) == s:TYPE.dict
-      call add(dict_keys, key)
+  " Separate leaves and dict keys depending on which_key_group_dicts_together
+  if exists('g:which_key_group_dicts') && g:which_key_group_dicts != ''
+
+    let leaf_keys = []
+    let dict_keys = []
+
+    for key in sort(filter(keys(mappings), 'v:val !=# "name"'), 'i')
+      if type(mappings[key]) == s:TYPE.dict
+        call add(dict_keys, key)
+      else
+        call add(leaf_keys, key)
+      endif
+    endfor
+
+    " Decide what's shown first leaves or dicts
+    if g:which_key_group_dicts ==? 'end'
+      let smap = leaf_keys + dict_keys
     else
-      call add(leaf_keys, key)
+      let smap = dict_keys + leaf_keys
     endif
-  endfor
 
-  let smap = leaf_keys + dict_keys
+  else
+    let smap = sort(filter(keys(mappings), 'v:val !=# "name"'), 'i')
+  endif
 
   let displaynames = which_key#renderer#get_displaynames()
   if get(g:, 'which_key_align_by_seperator', 1)

doc/vim-which-key.txt

@@ -354,6 +354,18 @@ Possible value: `{0, 1}` .
     let g:which_key_centered = 0
 <
 
+                                            *g:which_key_group_dicts*
+Type: |String|
+Default: `end`
+
+Separate key and dictionary bindings, placing all the dictionary items
+accordingly. Set this option to empty string if you want to sort all which-key
+items alphabetically in spite of their type.
+Possible value: `{'', 'start', 'end'}` .
+>
+    let g:which_key_group_dicts = 'end'
+<
+
 ==============================================================================
 COMMANDS                                              *vim-which-key-commands*
 

plugin/which_key.vim

@@ -16,6 +16,7 @@ let g:which_key_max_size = get(g:, 'which_key_max_size', 0)
 let g:which_key_vertical = get(g:, 'which_key_vertical', 0)
 let g:which_key_position = get(g:, 'which_key_position', 'botright')
 let g:which_key_centered = get(g:, 'which_key_centered', 1)
+let g:which_key_group_dicts = get(g:, 'which_key_group_dicts', 'end')
 let g:which_key_sort_horizontal = get(g:, 'which_key_sort_horizontal', 0)
 let g:which_key_run_map_on_popup = get(g:, 'which_key_run_map_on_popup', 1)
 let g:which_key_align_by_seperator = get(g:, 'which_key_align_by_seperator', 1)