From 573d8352331d0fd2ee0b5f3147cfcdcf7f1d4afc Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Mon, 26 Nov 2018 12:05:35 +0900 Subject: [PATCH 1/2] Psql completion debug print feature Sometimes we find it bothersome to identify the code that actually made a tab-completion. Psql will show the line number and completion result to stderr by defining TABCOMPLETION_DEBUG at comiple time with this patch. --- src/bin/psql/tab-complete.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 9dbd555166..00aa730050 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -60,6 +60,40 @@ extern char *filename_completion_function(); #define completion_matches rl_completion_matches #endif +/* + * By enabling the following definition every completion attempt emits to + * stderr the details of every completion prefixed by the source line number + * where it is made. You can isolate them from console interaction by + * redirecting stderr into a file. + */ +#ifdef TABCOMPLETION_DEBUG +#ifdef HAVE_RL_COMPLETION_MATCHES +#define org_completion_matches rl_completion_matches +#else +#define org_completion_matches completion_matches +#endif + +#undef completion_matches +#define completion_matches(t, f) completion_debug(__LINE__, (t), (f)) + +static char **completion_debug(int line, + const char *text, rl_compentry_func_t *func) +{ + char **list = org_completion_matches(text, func); + + /* + * enclose empty list with brackets since it is an intermediate state + * which is immediately followed by a non-empty list. + */ + fprintf(stderr, "%s%d: \"%s\" -> (", list ? "" : "[", line, text); + for (int i = 0; list && list[i]; ++i) + fprintf(stderr, "%s\"%s\"", i ? ", " : "", list[i]); + fprintf(stderr, ")%s\n", list ? "": "]"); + + return list; +} +#endif + /* word break characters */ #define WORD_BREAKS "\t\n@$><=;|&{() " -- 2.16.3