diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2024-09-20 07:34:50 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2024-09-23 14:42:57 +0200 |
commit | 737f58e23230ea14f1648ac1fc7f442ea0f8563c (patch) | |
tree | d16bee4c0ad2bb5ff2ec058cd09133a285674fef /src/nvim/main.c | |
parent | 5acdc4499e2036c90172b2b085f207ee4d5cfee4 (diff) | |
download | rneovim-737f58e23230ea14f1648ac1fc7f442ea0f8563c.tar.gz rneovim-737f58e23230ea14f1648ac1fc7f442ea0f8563c.tar.bz2 rneovim-737f58e23230ea14f1648ac1fc7f442ea0f8563c.zip |
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.
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r-- | src/nvim/main.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index e060d0dcaf..dc102f6f6d 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -967,8 +967,8 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr, os_exit(2); } - if (o.type == kObjectTypeDictionary) { - rvobj.data.dictionary = o.data.dictionary; + if (o.type == kObjectTypeDict) { + rvobj.data.dict = o.data.dict; } else { fprintf(stderr, "vim._cs_remote returned unexpected value\n"); os_exit(2); @@ -977,32 +977,32 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr, TriState should_exit = kNone; TriState tabbed = kNone; - for (size_t i = 0; i < rvobj.data.dictionary.size; i++) { - if (strequal(rvobj.data.dictionary.items[i].key.data, "errmsg")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) { + for (size_t i = 0; i < rvobj.data.dict.size; i++) { + if (strequal(rvobj.data.dict.items[i].key.data, "errmsg")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeString) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'errmsg'\n"); os_exit(2); } - fprintf(stderr, "%s\n", rvobj.data.dictionary.items[i].value.data.string.data); + fprintf(stderr, "%s\n", rvobj.data.dict.items[i].value.data.string.data); os_exit(2); - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "result")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) { + } else if (strequal(rvobj.data.dict.items[i].key.data, "result")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeString) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'result'\n"); os_exit(2); } - printf("%s", rvobj.data.dictionary.items[i].value.data.string.data); - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "tabbed")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { + printf("%s", rvobj.data.dict.items[i].value.data.string.data); + } else if (strequal(rvobj.data.dict.items[i].key.data, "tabbed")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeBoolean) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'tabbed'\n"); os_exit(2); } - tabbed = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse; - } else if (strequal(rvobj.data.dictionary.items[i].key.data, "should_exit")) { - if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { + tabbed = rvobj.data.dict.items[i].value.data.boolean ? kTrue : kFalse; + } else if (strequal(rvobj.data.dict.items[i].key.data, "should_exit")) { + if (rvobj.data.dict.items[i].value.type != kObjectTypeBoolean) { fprintf(stderr, "vim._cs_remote returned an unexpected type for 'should_exit'\n"); os_exit(2); } - should_exit = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse; + should_exit = rvobj.data.dict.items[i].value.data.boolean ? kTrue : kFalse; } } if (should_exit == kNone || tabbed == kNone) { |