patch 8.0.1391: encoding empty string to JSON sometimes gives "null"
Problem: Encoding empty string to JSON sometimes gives "null".
Solution: Handle NULL string as empty string. (closes #2446)
diff --git a/src/json.c b/src/json.c
index e5e85eb..6f914ea 100644
--- a/src/json.c
+++ b/src/json.c
@@ -92,7 +92,7 @@
char_u numbuf[NUMBUFLEN];
if (res == NULL)
- ga_concat(gap, (char_u *)"null");
+ ga_concat(gap, (char_u *)"\"\"");
else
{
#if defined(FEAT_MBYTE) && defined(USE_ICONV)
@@ -237,7 +237,7 @@
case VAR_LIST:
l = val->vval.v_list;
if (l == NULL)
- ga_concat(gap, (char_u *)"null");
+ ga_concat(gap, (char_u *)"[]");
else
{
if (l->lv_copyID == copyID)
@@ -272,7 +272,7 @@
case VAR_DICT:
d = val->vval.v_dict;
if (d == NULL)
- ga_concat(gap, (char_u *)"null");
+ ga_concat(gap, (char_u *)"{}");
else
{
if (d->dv_copyID == copyID)
diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim
index 6c3d16c..acd2ea8 100644
--- a/src/testdir/test_json.vim
+++ b/src/testdir/test_json.vim
@@ -103,6 +103,10 @@
call assert_fails('echo json_encode(function("tr"))', 'E474:')
call assert_fails('echo json_encode([function("tr")])', 'E474:')
+ call assert_equal('{"a":""}', json_encode({'a': test_null_string()}))
+ call assert_equal('{"a":[]}', json_encode({"a": test_null_list()}))
+ call assert_equal('{"a":{}}', json_encode({"a": test_null_dict()}))
+
silent! let res = json_encode(function("tr"))
call assert_equal("", res)
endfunc
diff --git a/src/version.c b/src/version.c
index 16ba82a..af507e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1391,
+/**/
1390,
/**/
1389,