eval/*: Fix some linter errors

src/nvim/eval/decode.c

@@ -193,7 +193,7 @@ int json_decode_string(const char *const buf, const size_t len,
         } else if (didcolon) {
           EMSG2(_("E474: Comma after colon: %s"), p);
           goto json_decode_string_fail;
-        } if (last_container.container.v_type == VAR_DICT
+        } else if (last_container.container.v_type == VAR_DICT
                    && last_container.stack_index != kv_size(stack) - 1) {
           EMSG2(_("E474: Using comma in place of colon: %s"), p);
           goto json_decode_string_fail;
@@ -364,8 +364,7 @@ int json_decode_string(const char *const buf, const size_t len,
                   const int full_char = (
                       (int) (ch - SURROGATE_LO_START)
                       + ((fst_in_pair - SURROGATE_HI_START) << 10)
-                      + SURROGATE_FIRST_CHAR
-                  );
+                      + SURROGATE_FIRST_CHAR);
                   str_end += utf_char2bytes(full_char, (char_u *) str_end);
                   fst_in_pair = 0;
                 } else {

src/nvim/eval/encode.c

@@ -336,10 +336,7 @@ static int name##_convert_one_value(firstargtype firstargname, \
       } \
       CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, kMPConvList); \
       CONV_LIST_START(tv->vval.v_list); \
-      kv_push( \
-          MPConvStackVal, \
-          *mpstack, \
-          ((MPConvStackVal) { \
+      kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
         .type = kMPConvList, \
         .data = { \
           .l = { \