aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/sign.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2021-12-05 21:39:37 -0500
committerJames McCoy <jamessan@jamessan.com>2021-12-08 21:47:58 -0500
commitd0b3efb7db90ea8fe2637c9538c8b63acc5fbd19 (patch)
tree23265dcf9573052bb31cb4dae9054e79c1bef4c6 /src/nvim/sign.c
parente8f9262125535bea8c7fcf833a715b569e07996e (diff)
downloadrneovim-d0b3efb7db90ea8fe2637c9538c8b63acc5fbd19.tar.gz
rneovim-d0b3efb7db90ea8fe2637c9538c8b63acc5fbd19.tar.bz2
rneovim-d0b3efb7db90ea8fe2637c9538c8b63acc5fbd19.zip
vim-patch:8.2.3743: ":sign" can add a highlight group without a name
Problem: ":sign" can add a highlight group without a name. Solution: Give an error if the group name is missing. (closes vim/vim#9280) https://github.com/vim/vim/commit/5e18ccc60bdddc4aa39ab039f1a7c918f29e67ce
Diffstat (limited to 'src/nvim/sign.c')
-rw-r--r--src/nvim/sign.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/nvim/sign.c b/src/nvim/sign.c
index d2faac2b94..ec0e50f6d4 100644
--- a/src/nvim/sign.c
+++ b/src/nvim/sign.c
@@ -1132,6 +1132,15 @@ linenr_T sign_jump(int sign_id, char_u *sign_group, buf_T *buf)
return lnum;
}
+static int check_empty_group(size_t len, char *name)
+{
+ if (len == 0) {
+ semsg(_(e_group_name_missing_for_str), name);
+ return FAIL;
+ }
+ return OK;
+}
+
/// ":sign define {name} ..." command
static void sign_define_cmd(char_u *sign_name, char_u *cmdline)
{
@@ -1160,15 +1169,31 @@ static void sign_define_cmd(char_u *sign_name, char_u *cmdline)
text = vim_strnsave(arg, (size_t)(p - arg));
} else if (STRNCMP(arg, "linehl=", 7) == 0) {
arg += 7;
+ if (check_empty_group(p - arg, "linehl") == FAIL) {
+ failed = true;
+ break;
+ }
linehl = vim_strnsave(arg, (size_t)(p - arg));
} else if (STRNCMP(arg, "texthl=", 7) == 0) {
arg += 7;
+ if (check_empty_group(p - arg, "texthl") == FAIL) {
+ failed = true;
+ break;
+ }
texthl = vim_strnsave(arg, (size_t)(p - arg));
} else if (STRNCMP(arg, "culhl=", 6) == 0) {
arg += 6;
+ if (check_empty_group(p - arg, "culhl") == FAIL) {
+ failed = true;
+ break;
+ }
culhl = vim_strnsave(arg, (size_t)(p - arg));
} else if (STRNCMP(arg, "numhl=", 6) == 0) {
arg += 6;
+ if (check_empty_group(p - arg, "numhl") == FAIL) {
+ failed = true;
+ break;
+ }
numhl = vim_strnsave(arg, (size_t)(p - arg));
} else {
semsg(_(e_invarg2), arg);