refactor(api)!: rename Dictionary => Dict

In the api_info() output:

    :new|put =map(filter(api_info().functions, '!has_key(v:val,''deprecated_since'')'), 'v:val')
    ...

    {'return_type': 'ArrayOf(Integer, 2)', 'name': 'nvim_win_get_position', 'method': v:true, 'parameters': [['Window', 'window']], 'since': 1}

The `ArrayOf(Integer, 2)` return type didn't break clients when we added
it, which is evidence that clients don't use the `return_type` field,
thus renaming Dictionary => Dict in api_info() is not (in practice)
a breaking change.

3 files changed, 11 insertions, 11 deletions

diff --git a/test/unit/api/private_helpers_spec.lua b/test/unit/api/private_helpers_spec.lua
index a31374bd70..bdfc83a031 100644
--- a/test/unit/api/private_helpers_spec.lua
+++ b/test/unit/api/private_helpers_spec.lua
@@ -43,9 +43,9 @@ describe('vim_to_object', function()
   simple_test('converts empty string', '')
   simple_test('converts non-empty string', 'foobar')
   simple_test('converts integer 10', { [type_key] = int_type, value = 10 })
-  simple_test('converts empty dictionary', {})
-  simple_test('converts dictionary with scalar values', { test = 10, test2 = true, test3 = 'test' })
-  simple_test('converts dictionary with containers inside', { test = {}, test2 = { 1, 2 } })
+  simple_test('converts empty dict', {})
+  simple_test('converts dict with scalar values', { test = 10, test2 = true, test3 = 'test' })
+  simple_test('converts dict with containers inside', { test = {}, test2 = { 1, 2 } })
   simple_test('converts empty list', { [type_key] = list_type })
   simple_test('converts list with scalar values', { 1, 2, 'test', 'foo' })
   simple_test(
diff --git a/test/unit/api/testutil.lua b/test/unit/api/testutil.lua
index 0946ef194c..bb387ae0e1 100644
--- a/test/unit/api/testutil.lua
+++ b/test/unit/api/testutil.lua
@@ -35,10 +35,10 @@ local function init_obj2lua_tab()
       end
       return ret
     end,
-    [tonumber(api.kObjectTypeDictionary)] = function(obj)
+    [tonumber(api.kObjectTypeDict)] = function(obj)
       local ret = {}
-      for i = 1, tonumber(obj.data.dictionary.size) do
-        local kv_pair = obj.data.dictionary.items[i - 1]
+      for i = 1, tonumber(obj.data.dict.size) do
+        local kv_pair = obj.data.dict.items[i - 1]
         ret[ffi.string(kv_pair.key.data, kv_pair.key.size)] = obj2lua(kv_pair.value)
       end
       return ret
@@ -112,8 +112,8 @@ local lua2obj_type_tab = {
       end
     end
     local len = #kvs
-    local dct = obj(api.kObjectTypeDictionary, {
-      dictionary = {
+    local dct = obj(api.kObjectTypeDict, {
+      dict = {
         size = len,
         capacity = len,
         items = ffi.cast('KeyValuePair *', api.xmalloc(len * ffi.sizeof('KeyValuePair'))),
@@ -121,7 +121,7 @@ local lua2obj_type_tab = {
     })
     for i = 1, len do
       local key, val = unpack(kvs[i])
-      dct.data.dictionary.items[i - 1] = ffi.new(
+      dct.data.dict.items[i - 1] = ffi.new(
         'KeyValuePair',
         { key = ffi.gc(lua2obj(key), nil).data.string, value = ffi.gc(lua2obj(val), nil) }
       )
diff --git a/test/unit/statusline_spec.lua b/test/unit/statusline_spec.lua
index 973d9ec992..a97a4f41d7 100644
--- a/test/unit/statusline_spec.lua
+++ b/test/unit/statusline_spec.lua
@@ -56,14 +56,14 @@ describe('build_stl_str_hl', function()
   -- @param input_stl The format string for the statusline
   -- @param expected_stl The expected result string for the statusline
   --
-  -- @param arg Options can be placed in an optional dictionary as the last parameter
+  -- @param arg Options can be placed in an optional dict as the last parameter
   --    .expected_cell_count The expected number of cells build_stl_str_hl will return
   --    .expected_byte_length The expected byte length of the string (defaults to byte length of expected_stl)
   --    .file_name The name of the file to be tested (useful in %f type tests)
   --    .fillchar The character that will be used to fill any 'extra' space in the stl
   local function statusline_test(description, statusline_cell_count, input_stl, expected_stl, arg)
     -- arg is the optional parameter
-    -- so we either fill in option with arg or an empty dictionary
+    -- so we either fill in option with arg or an empty dict
     local option = arg or {}
 
     local fillchar = option.fillchar or ' '