diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-06-22 15:37:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 15:37:32 +0800 |
| commit | a41883bfbea990c9f8b29060b21580139970afc1 (patch) | |
| tree | 2307ef0909d76ee6c9eb377d8182964c605ddb9d /src/nvim/api/extmark.c | |
| parent | 43e76cc3462bc5bcf2b6ade8af1c36e21d3da3c9 (diff) | |
| parent | a9cd8467cbd54035e7814b862054c828467c2ce2 (diff) | |
| download | rneovim-a41883bfbea990c9f8b29060b21580139970afc1.tar.gz rneovim-a41883bfbea990c9f8b29060b21580139970afc1.tar.bz2 rneovim-a41883bfbea990c9f8b29060b21580139970afc1.zip | |
Merge pull request #24098 from zeertzjq/fix-extmark
Fix two extmark bugs
Diffstat (limited to 'src/nvim/api/extmark.c')
| -rw-r--r-- | src/nvim/api/extmark.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index aca290494b..1946d77846 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -701,7 +701,7 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer } else if (strequal("inline", str.data)) { decor.virt_text_pos = kVTInline; } else { - VALIDATE_S(false, "virt_text_pos", "", { + VALIDATE_S(false, "virt_text_pos", str.data, { goto error; }); } @@ -719,7 +719,11 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer OPTION_TO_BOOL(decor.virt_text_hide, virt_text_hide, false); OPTION_TO_BOOL(decor.hl_eol, hl_eol, false); - if (opts->hl_mode.type == kObjectTypeString) { + if (HAS_KEY(opts->hl_mode)) { + VALIDATE_T("hl_mode", kObjectTypeString, opts->hl_mode.type, { + goto error; + }); + String str = opts->hl_mode.data.string; if (strequal("replace", str.data)) { decor.hl_mode = kHlModeReplace; @@ -728,14 +732,10 @@ Integer nvim_buf_set_extmark(Buffer buffer, Integer ns_id, Integer line, Integer } else if (strequal("blend", str.data)) { decor.hl_mode = kHlModeBlend; } else { - VALIDATE_S(false, "virt_text_pos", "", { + VALIDATE_S(false, "hl_mode", str.data, { goto error; }); } - } else if (HAS_KEY(opts->hl_mode)) { - VALIDATE_T("hl_mode", kObjectTypeString, opts->hl_mode.type, { - goto error; - }); } bool virt_lines_leftcol = false; |