diff options
| author | Famiu Haque <famiuhaque@proton.me> | 2023-05-23 14:25:10 +0600 |
|---|---|---|
| committer | Famiu Haque <famiuhaque@proton.me> | 2023-05-23 15:20:41 +0600 |
| commit | cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f (patch) | |
| tree | 9cae576fc90b55c9586286706a9d1754762bea8b /src/nvim/mapping.c | |
| parent | 62a80c36c158ecf4ffc8c93d8891aeb2f0d2f287 (diff) | |
| download | rneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.tar.gz rneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.tar.bz2 rneovim-cfd4fdfea4d0e68ea50ad412b88b5289ded6fd6f.zip | |
refactor(api): new helper macros
Adds new API helper macros `CSTR_AS_OBJ()`, `STATIC_CSTR_AS_OBJ()`, and `STATIC_CSTR_TO_OBJ()`, which cleans up a lot of the current code. These macros will also be used extensively in the upcoming option refactor PRs because then API Objects will be used to get/set options. This PR also modifies pre-existing code to use old API helper macros like `CSTR_TO_OBJ()` to make them cleaner.
Diffstat (limited to 'src/nvim/mapping.c')
| -rw-r--r-- | src/nvim/mapping.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c index c5449bd66e..e40e67cead 100644 --- a/src/nvim/mapping.c +++ b/src/nvim/mapping.c @@ -2096,13 +2096,13 @@ static Dictionary mapblock_fill_dict(const mapblock_T *const mp, const char *lhs : cstr_as_string(str2special_save(mp->m_str, false, true)))); } if (mp->m_desc != NULL) { - PUT(dict, "desc", STRING_OBJ(cstr_to_string(mp->m_desc))); + PUT(dict, "desc", CSTR_TO_OBJ(mp->m_desc)); } - PUT(dict, "lhs", STRING_OBJ(cstr_as_string(lhs))); - PUT(dict, "lhsraw", STRING_OBJ(cstr_to_string(mp->m_keys))); + PUT(dict, "lhs", CSTR_AS_OBJ(lhs)); + PUT(dict, "lhsraw", CSTR_TO_OBJ(mp->m_keys)); if (lhsrawalt != NULL) { // Also add the value for the simplified entry. - PUT(dict, "lhsrawalt", STRING_OBJ(cstr_to_string(lhsrawalt))); + PUT(dict, "lhsrawalt", CSTR_TO_OBJ(lhsrawalt)); } PUT(dict, "noremap", INTEGER_OBJ(noremap_value)); PUT(dict, "script", INTEGER_OBJ(mp->m_noremap == REMAP_SCRIPT ? 1 : 0)); @@ -2115,7 +2115,7 @@ static Dictionary mapblock_fill_dict(const mapblock_T *const mp, const char *lhs if (mp->m_replace_keycodes) { PUT(dict, "replace_keycodes", INTEGER_OBJ(1)); } - PUT(dict, "mode", STRING_OBJ(cstr_as_string(mapmode))); + PUT(dict, "mode", CSTR_AS_OBJ(mapmode)); return dict; } |