From f810edb53421ad26242e48ad74a955f5ccbce284 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Fri, 9 Feb 2018 19:16:19 +0300 Subject: [PATCH] Interactive shell: fixed non-ascii character support. --- njs/njs.c | 3 +++ njs/test/njs_expect_test.exp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/njs/njs.c b/njs/njs.c index 5c97b524..ebdc5669 100644 --- a/njs/njs.c +++ b/njs/njs.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -459,6 +460,8 @@ njs_editline_init(njs_vm_t *vm) rl_attempted_completion_function = njs_completion_handler; rl_basic_word_break_characters = (char *) " \t\n\"\\'`@$><=;,|&{("; + setlocale(LC_ALL, ""); + njs_completion.completions = njs_vm_completions(vm, NULL); if (njs_completion.completions == NULL) { return NXT_ERROR; diff --git a/njs/test/njs_expect_test.exp b/njs/test/njs_expect_test.exp index ea04155f..0f0b58c0 100644 --- a/njs/test/njs_expect_test.exp +++ b/njs/test/njs_expect_test.exp @@ -182,6 +182,14 @@ njs_test { "JSON.parse(Error()\r\nSyntaxError: Unexpected token \"\" in 1"} } +# Non-ASCII characters +njs_test { + {"'絵文字'\r\n" + "絵文字"} + {"var v = 'абвгдеёжзийкл';v[10]\r\n" + "й"} +} + # require('fs') set file [open njs_test_file w] -- 2.47.3