From 137eedb4edab1643b47282cce4ca07dd2ee42a63 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 11 May 2018 21:26:05 +0200
Subject: API: nvim_get_commands(): return Dictionary

---
 src/nvim/api/buffer.c | 17 ++++++++---------
 src/nvim/api/vim.c    | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index eda7fcd74c..fa4ad27e60 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -467,7 +467,7 @@ Integer nvim_buf_get_changedtick(Buffer buffer, Error *err)
 /// @returns Array of maparg()-like dictionaries describing mappings.
 ///          The "buffer" key holds the associated buffer handle.
 ArrayOf(Dictionary) nvim_buf_get_keymap(Buffer buffer, String mode, Error *err)
-    FUNC_API_SINCE(3)
+  FUNC_API_SINCE(3)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -478,16 +478,15 @@ ArrayOf(Dictionary) nvim_buf_get_keymap(Buffer buffer, String mode, Error *err)
   return keymap_array(mode, buf);
 }
 
-/// Gets a list of buffer-local |user-commands|.
+/// Gets a map of buffer-local |user-commands|.
 ///
 /// @param  buffer  Buffer handle.
 /// @param  opts  Optional parameters. Currently not used.
 /// @param[out]  err   Error details, if any.
 ///
-/// @returns Array of dictionaries describing commands.
-ArrayOf(Dictionary) nvim_buf_get_commands(Buffer buffer, Dictionary opts,
-                                          Error *err)
-    FUNC_API_SINCE(4)
+/// @returns Map of maps describing commands.
+Dictionary nvim_buf_get_commands(Buffer buffer, Dictionary opts, Error *err)
+  FUNC_API_SINCE(4)
 {
   bool global = (buffer == -1);
   bool builtin = false;
@@ -497,7 +496,7 @@ ArrayOf(Dictionary) nvim_buf_get_commands(Buffer buffer, Dictionary opts,
     Object v = opts.items[i].value;
     if (!strequal("builtin", k.data)) {
       api_set_error(err, kErrorTypeValidation, "unexpected key: %s", k.data);
-      return (Array)ARRAY_DICT_INIT;
+      return (Dictionary)ARRAY_DICT_INIT;
     }
     if (strequal("builtin", k.data)) {
       builtin = v.data.boolean;
@@ -507,14 +506,14 @@ ArrayOf(Dictionary) nvim_buf_get_commands(Buffer buffer, Dictionary opts,
   if (global) {
     if (builtin) {
       api_set_error(err, kErrorTypeValidation, "builtin=true not implemented");
-      return (Array)ARRAY_DICT_INIT;
+      return (Dictionary)ARRAY_DICT_INIT;
     }
     return commands_array(NULL);
   }
 
   buf_T *buf = find_buffer_by_handle(buffer, err);
   if (builtin || !buf) {
-    return (Array)ARRAY_DICT_INIT;
+    return (Dictionary)ARRAY_DICT_INIT;
   }
   return commands_array(buf);
 }
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 305cc1a43c..7a951d4e67 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -954,12 +954,12 @@ Dictionary nvim_get_mode(void)
 /// @returns Array of maparg()-like dictionaries describing mappings.
 ///          The "buffer" key is always zero.
 ArrayOf(Dictionary) nvim_get_keymap(String mode)
-    FUNC_API_SINCE(3)
+  FUNC_API_SINCE(3)
 {
   return keymap_array(mode, NULL);
 }
 
-/// Gets a list of global (non-buffer-local) Ex commands.
+/// Gets a map of global (non-buffer-local) Ex commands.
 ///
 /// Currently only |user-commands| are supported, not builtin Ex commands.
 ///
@@ -967,9 +967,9 @@ ArrayOf(Dictionary) nvim_get_keymap(String mode)
 ///               {"builtin":false}
 /// @param[out]  err   Error details, if any.
 ///
-/// @returns Array of dictionaries describing commands.
-ArrayOf(Dictionary) nvim_get_commands(Dictionary opts, Error *err)
-    FUNC_API_SINCE(4)
+/// @returns Map of maps describing commands.
+Dictionary nvim_get_commands(Dictionary opts, Error *err)
+  FUNC_API_SINCE(4)
 {
   return nvim_buf_get_commands(-1, opts, err);
 }
-- 
cgit