aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-03-07 06:41:00 +0300
committerZyX <kp-pav@yandex.ru>2016-04-18 02:48:20 +0300
commit4a29995fe74ed95c641ef40c68d8a4223e90cccf (patch)
tree7335ee8b49f9662e086371c550017d7dbd119f10
parent1fc84ae2cd07f10f769ef966dd92b18ca8552748 (diff)
downloadrneovim-4a29995fe74ed95c641ef40c68d8a4223e90cccf.tar.gz
rneovim-4a29995fe74ed95c641ef40c68d8a4223e90cccf.tar.bz2
rneovim-4a29995fe74ed95c641ef40c68d8a4223e90cccf.zip
eval/decode: Rename brackets in error messages
U+007D is officially RIGHT CURLY BRACKET. U+005D is officially RIGHT SQUARE BRACKET.
-rw-r--r--src/nvim/eval/decode.c4
-rw-r--r--test/functional/eval/json_functions_spec.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index d6426ee643..fc6e912c20 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -249,10 +249,10 @@ json_decode_string_cycle_start:
}
ContainerStackItem last_container = kv_last(container_stack);
if (*p == '}' && last_container.container.v_type != VAR_DICT) {
- EMSG2(_("E474: Closing list with figure brace: %s"), p);
+ EMSG2(_("E474: Closing list with curly bracket: %s"), p);
goto json_decode_string_fail;
} else if (*p == ']' && last_container.container.v_type != VAR_LIST) {
- EMSG2(_("E474: Closing dictionary with bracket: %s"), p);
+ EMSG2(_("E474: Closing dictionary with square bracket: %s"), p);
goto json_decode_string_fail;
} else if (didcomma) {
EMSG2(_("E474: Trailing comma: %s"), p);
diff --git a/test/functional/eval/json_functions_spec.lua b/test/functional/eval/json_functions_spec.lua
index d6286611d2..131b177622 100644
--- a/test/functional/eval/json_functions_spec.lua
+++ b/test/functional/eval/json_functions_spec.lua
@@ -198,9 +198,9 @@ describe('json_decode() function', function()
it('fails to parse containers which are closed by different brackets',
function()
- eq('Vim(call):E474: Closing dictionary with bracket: ]',
+ eq('Vim(call):E474: Closing dictionary with square bracket: ]',
exc_exec('call json_decode("{]")'))
- eq('Vim(call):E474: Closing list with figure brace: }',
+ eq('Vim(call):E474: Closing list with curly bracket: }',
exc_exec('call json_decode("[}")'))
end)