From 62db341638bd9515584f9c24b0adfeec61ada252 Mon Sep 17 00:00:00 2001 From: alterego655 <824662526@qq.com> Date: Tue, 16 Dec 2025 11:00:25 +0800 Subject: [PATCH v7 3/4] Add tab completion for WAIT FOR LSN MODE option Update psql tab completion to support the MODE option in WAIT FOR LSN command's WITH clause. After typing 'mode' inside the parenthesized option list, completion offers the valid mode values: 'replay', 'write', and 'flush'. --- src/bin/psql/tab-complete.in.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c index b1ff6f6cd94..5cb8de14e8e 100644 --- a/src/bin/psql/tab-complete.in.c +++ b/src/bin/psql/tab-complete.in.c @@ -5329,8 +5329,10 @@ match_previous_words(int pattern_id, /* * WAIT FOR LSN '' [ WITH ( option [, ...] ) ] * where option can be: + * MODE '' * TIMEOUT '' * NO_THROW + * and mode can be: replay | write | flush */ else if (Matches("WAIT")) COMPLETE_WITH("FOR"); @@ -5343,21 +5345,21 @@ match_previous_words(int pattern_id, COMPLETE_WITH("WITH"); else if (Matches("WAIT", "FOR", "LSN", MatchAny, "WITH")) COMPLETE_WITH("("); + + /* + * Handle parenthesized option list. This fires when we're in an + * unfinished parenthesized option list. get_previous_words treats a + * completed parenthesized option list as one word, so the above test is + * correct. mode takes a string value ('replay', 'write', 'flush'), + * timeout takes a string value, no_throw takes no value. + */ else if (HeadMatches("WAIT", "FOR", "LSN", MatchAny, "WITH", "(*") && !HeadMatches("WAIT", "FOR", "LSN", MatchAny, "WITH", "(*)")) { - /* - * This fires if we're in an unfinished parenthesized option list. - * get_previous_words treats a completed parenthesized option list as - * one word, so the above test is correct. - */ if (ends_with(prev_wd, '(') || ends_with(prev_wd, ',')) - COMPLETE_WITH("timeout", "no_throw"); - - /* - * timeout takes a string value, no_throw takes no value. We don't - * offer completions for these values. - */ + COMPLETE_WITH("mode", "timeout", "no_throw"); + else if (TailMatches("mode")) + COMPLETE_WITH("'replay'", "'write'", "'flush'"); } /* WITH [RECURSIVE] */ -- 2.51.0