>From 7bc15025af64dd689795466cf4661ccf5a69f2bd Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 19 Nov 2015 16:03:48 +0900
Subject: [PATCH 4/4] Remove less informative comments.

Regular expressions made each matchings self-descriptive so most of
the comments just repeating the matching description are no longer
needed.
---
 src/bin/psql/tab-complete.c | 307 +++-----------------------------------------
 1 file changed, 19 insertions(+), 288 deletions(-)

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 89aeddb..1b3c188 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1071,18 +1071,14 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(sql_commands);
 
 /* CREATE */
-	/* complete with something you can create */
 	else if (MATCH("^CREATE"))
 		matches = completion_matches(text, create_command_generator);
 
 /* DROP, but not DROP embedded in other commands */
-	/* complete with something you can drop */
 	else if (MATCH("^DROP"))
 		matches = completion_matches(text, drop_command_generator);
 
 /* ALTER */
-
-	/* ALTER TABLE */
 	else if (MATCH("^ALTER TABLE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,
 								   "UNION SELECT 'ALL IN TABLESPACE'");
@@ -1094,12 +1090,13 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("^ALTER"))
 	{
 		static const char *const list_ALTER[] =
-		{"AGGREGATE", "COLLATION", "CONVERSION", "DATABASE", "DEFAULT PRIVILEGES", "DOMAIN",
-			"EVENT TRIGGER", "EXTENSION", "FOREIGN DATA WRAPPER", "FOREIGN TABLE", "FUNCTION",
-			"GROUP", "INDEX", "LANGUAGE", "LARGE OBJECT", "MATERIALIZED VIEW", "OPERATOR",
-			"POLICY", "ROLE", "RULE", "SCHEMA", "SERVER", "SEQUENCE", "SYSTEM", "TABLE",
-			"TABLESPACE", "TEXT SEARCH", "TRIGGER", "TYPE",
-		"USER", "USER MAPPING FOR", "VIEW", NULL};
+		{"AGGREGATE", "COLLATION", "CONVERSION", "DATABASE",
+		 "DEFAULT PRIVILEGES", "DOMAIN", "EVENT TRIGGER", "EXTENSION",
+		 "FOREIGN DATA WRAPPER", "FOREIGN TABLE", "FUNCTION", "GROUP",
+		 "INDEX", "LANGUAGE", "LARGE OBJECT", "MATERIALIZED VIEW",
+		 "OPERATOR", "POLICY", "ROLE", "RULE", "SCHEMA", "SERVER",
+		 "SEQUENCE", "SYSTEM", "TABLE", "TABLESPACE", "TEXT SEARCH",
+		 "TRIGGER", "TYPE", "USER", "USER MAPPING FOR", "VIEW", NULL};
 
 		COMPLETE_WITH_LIST(list_ALTER);
 	}
@@ -1114,12 +1111,13 @@ psql_completion(const char *text, int start, int end)
 	/* ALTER TABLE,INDEX,MATERIALIZED VIEW xxx ALL IN TABLESPACE xxx OWNED BY */
 	else if (MATCH("ALL IN TABLESPACE #id OWNED BY"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
-	/* ALTER AGGREGATE,FUNCTION <name> */
+
 	else if (MATCH("^ALTER {AGGREGATE|FUNCTION} #id"))
 		COMPLETE_WITH_CONST("(");
-	/* ALTER AGGREGATE,FUNCTION <name> (...) */
+
 	else if (MATCH("ALTER {AGGREGATE|FUNCTION} [#id](.."))
 		COMPLETE_WITH_FUNCTION_ARG(CAPTURE(1));
+
 	else if (MATCH("ALTER {AGGREGATE|FUNCTION} [#id](..)"))
 	{
 		static const char *const list_ALTERAGG[] =
@@ -1128,7 +1126,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERAGG);
 	}
 
-	/* ALTER SCHEMA <name> */
 	else if (MATCH("ALTER SCHEMA #id"))
 	{
 		static const char *const list_ALTERGEN[] =
@@ -1137,7 +1134,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERGEN);
 	}
 
-	/* ALTER COLLATION <name> */
 	else if (MATCH("ALTER COLLATION #id"))
 	{
 		static const char *const list_ALTERGEN[] =
@@ -1146,7 +1142,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERGEN);
 	}
 
-	/* ALTER CONVERSION <name> */
 	else if (MATCH("ALTER CONVERSION #id"))
 	{
 		static const char *const list_ALTERGEN[] =
@@ -1155,7 +1150,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERGEN);
 	}
 
-	/* ALTER DATABASE <name> */
 	else if (MATCH("ALTER DATABASE #id"))
 	{
 		static const char *const list_ALTERDATABASE[] =
@@ -1165,13 +1159,11 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERDATABASE);
 	}
 
-	/* ALTER EVENT TRIGGER */
 	else if (MATCH("ALTER EVENT TRIGGER"))
 	{
 		COMPLETE_WITH_QUERY(Query_for_list_of_event_triggers, NULL);
 	}
 
-	/* ALTER EVENT TRIGGER <name> */
 	else if (MATCH("ALTER EVENT TRIGGER #id"))
 	{
 		static const char *const list_ALTER_EVENT_TRIGGER[] =
@@ -1180,7 +1172,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTER_EVENT_TRIGGER);
 	}
 
-	/* ALTER EVENT TRIGGER <name> ENABLE */
 	else if (MATCH("ALTER EVENT TRIGGER #id ENABLE"))
 	{
 		static const char *const list_ALTER_EVENT_TRIGGER_ENABLE[] =
@@ -1189,7 +1180,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTER_EVENT_TRIGGER_ENABLE);
 	}
 
-	/* ALTER EXTENSION <name> */
 	else if (MATCH("ALTER EXTENSION #id"))
 	{
 		static const char *const list_ALTEREXTENSION[] =
@@ -1198,7 +1188,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTEREXTENSION);
 	}
 
-	/* ALTER FOREIGN */
 	else if (MATCH("ALTER FOREIGN"))
 	{
 		static const char *const list_ALTER_FOREIGN[] =
@@ -1207,7 +1196,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTER_FOREIGN);
 	}
 
-	/* ALTER FOREIGN DATA WRAPPER <name> */
 	else if (MATCH("ALTER FOREIGN DATA WRAPPER #id"))
 	{
 		static const char *const list_ALTER_FDW[] =
@@ -1216,7 +1204,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTER_FDW);
 	}
 
-	/* ALTER FOREIGN TABLE <name> */
 	else if (MATCH("ALTER FOREIGN TABLE #id"))
 	{
 		static const char *const list_ALTER_FOREIGN_TABLE[] =
@@ -1226,14 +1213,10 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTER_FOREIGN_TABLE);
 	}
-
-	/* ALTER INDEX */
 	else if (MATCH("ALTER INDEX"))
-	{
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   "UNION SELECT 'ALL IN TABLESPACE'");
-	}
-	/* ALTER INDEX <name> */
+
 	else if (MATCH("ALTER INDEX #id"))
 	{
 		static const char *const list_ALTERINDEX[] =
@@ -1241,7 +1224,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERINDEX);
 	}
-	/* ALTER INDEX <name> SET */
 	else if (MATCH("ALTER INDEX #id SET"))
 	{
 		static const char *const list_ALTERINDEXSET[] =
@@ -1249,10 +1231,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERINDEXSET);
 	}
-	/* ALTER INDEX <name> RESET */
 	else if (MATCH("ALTER INDEX #id RESET"))
 		COMPLETE_WITH_CONST("(");
-	/* ALTER INDEX <foo> SET|RESET ( */
+
 	else if (MATCH("ALTER INDEX #id RESET("))
 	{
 		static const char *const list_INDEXOPTIONS[] =
@@ -1268,7 +1249,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_INDEXOPTIONS);
 	}
 
-	/* ALTER LANGUAGE <name> */
 	else if (MATCH("ALTER LANGUAGE #id"))
 	{
 		static const char *const list_ALTERLANGUAGE[] =
@@ -1277,7 +1257,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERLANGUAGE);
 	}
 
-	/* ALTER LARGE OBJECT <oid> */
 	else if (MATCH("ALTER LARGE OBJECT #id"))
 	{
 		static const char *const list_ALTERLARGEOBJECT[] =
@@ -1286,14 +1265,12 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERLARGEOBJECT);
 	}
 
-	/* ALTER MATERIALIZED VIEW */
 	else if (MATCH("ALTER MATERIALIZED VIEW"))
 	{
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_matviews,
 								   "UNION SELECT 'ALL IN TABLESPACE'");
 	}
 
-	/* ALTER USER,ROLE <name> */
 	else if (MATCH("ALTER {{USER !MAPPING}|{ROLE #id}}"))
 	{
 		static const char *const list_ALTERUSER[] =
@@ -1307,7 +1284,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERUSER);
 	}
 
-	/* ALTER USER,ROLE <name> WITH */
 	else if (MATCH("ALTER {USER|ROLE} #id WITH"))
 	{
 		/* Similar to the above, but don't complete "WITH" again. */
@@ -1322,11 +1298,9 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERUSER_WITH);
 	}
 
-	/* complete ALTER USER,ROLE <name> ENCRYPTED,UNENCRYPTED with PASSWORD */
 	else if (MATCH("ALTER {ROLE|USER} #id {UN}?ENCRYPTED"))
 		COMPLETE_WITH_CONST("PASSWORD");
 
-	/* ALTER DEFAULT PRIVILEGES */
 	else if (MATCH("ALTER DEFAULT PRIVILEGES"))
 	{
 		static const char *const list_ALTER_DEFAULT_PRIVILEGES[] =
@@ -1334,7 +1308,7 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES);
 	}
-	/* ALTER DEFAULT PRIVILEGES FOR */
+
 	else if (MATCH("ALTER DEFAULT PRIVILEGES FOR"))
 	{
 		static const char *const list_ALTER_DEFAULT_PRIVILEGES_FOR[] =
@@ -1350,7 +1324,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTER_DEFAULT_PRIVILEGES_REST);
 	}
-	/* ALTER DOMAIN <name> */
 	else if (MATCH("ALTER DOMAIN #id"))
 	{
 		static const char *const list_ALTERDOMAIN[] =
@@ -1358,7 +1331,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERDOMAIN);
 	}
-	/* ALTER DOMAIN <sth> DROP */
 	else if (MATCH("ALTER DOMAIN #id DROP"))
 	{
 		static const char *const list_ALTERDOMAIN2[] =
@@ -1366,11 +1338,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERDOMAIN2);
 	}
-	/* ALTER DOMAIN <sth> DROP|RENAME|VALIDATE CONSTRAINT */
 	else if (MATCH("ALTER DOMAIN [#id] {DROP|RENAME|VALIDATE} CONSTRAINT"))
 		COMPLETE_WITH_QUERY(Query_for_constraint_of_type, CAPTURE(1));
 
-	/* ALTER DOMAIN <sth> RENAME */
 	else if (MATCH("ALTER DOMAIN #id RENAME"))
 	{
 		static const char *const list_ALTERDOMAIN[] =
@@ -1378,11 +1348,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERDOMAIN);
 	}
-	/* ALTER DOMAIN <sth> RENAME CONSTRAINT <sth> */
 	else if (MATCH("ALTER DOMAIN #id RENAME CONSTRAINT #id"))
 		COMPLETE_WITH_CONST("TO");
 
-	/* ALTER DOMAIN <sth> SET */
 	else if (MATCH("ALTER DOMAIN #id SET"))
 	{
 		static const char *const list_ALTERDOMAIN3[] =
@@ -1390,7 +1358,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERDOMAIN3);
 	}
-	/* ALTER SEQUENCE <name> */
 	else if (MATCH("ALTER SEQUENCE #id"))
 	{
 		static const char *const list_ALTERSEQUENCE[] =
@@ -1399,7 +1366,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERSEQUENCE);
 	}
-	/* ALTER SEQUENCE <name> NO */
 	else if (MATCH("ALTER SEQUENCE #id NO"))
 	{
 		static const char *const list_ALTERSEQUENCE2[] =
@@ -1407,7 +1373,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERSEQUENCE2);
 	}
-	/* ALTER SERVER <name> */
 	else if (MATCH("ALTER SERVER #id"))
 	{
 		static const char *const list_ALTER_SERVER[] =
@@ -1415,7 +1380,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTER_SERVER);
 	}
-	/* ALTER SYSTEM SET, RESET, RESET ALL */
 	else if (MATCH("ALTER SYSTEM"))
 	{
 		static const char *const list_ALTERSYSTEM[] =
@@ -1423,11 +1387,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERSYSTEM);
 	}
-	/* ALTER SYSTEM SET|RESET <name> */
 	else if (MATCH("ALTER SYSTEM {SET|RESET}"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_alter_system_set_vars, NULL);
 
-	/* ALTER VIEW <name> */
 	else if (MATCH("ALTER VIEW #id"))
 	{
 		static const char *const list_ALTERVIEW[] =
@@ -1435,7 +1397,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERVIEW);
 	}
-	/* ALTER MATERIALIZED VIEW <name> */
 	else if (MATCH("ALTER MATERIALIZED VIEW #id"))
 	{
 		static const char *const list_ALTERMATVIEW[] =
@@ -1444,15 +1405,12 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERMATVIEW);
 	}
 
-	/* ALTER POLICY <name> ON */
 	else if (MATCH("ALTER POLICY #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* ALTER POLICY <name> ON <table> */
 	else if (MATCH("ALTER POLICY #id ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-	/* ALTER POLICY <name> ON <table> - show options */
 	else if (MATCH("ALTER POLICY #id ON #id"))
 	{
 		static const char *const list_ALTERPOLICY[] =
@@ -1460,51 +1418,33 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERPOLICY);
 	}
-	/* ALTER POLICY <name> ON <table> TO <role> */
 	else if (MATCH("ALTER POLICY #id ON #id TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	/* ALTER POLICY <name> ON <table> USING ( */
 	else if (MATCH("ALTER POLICY #id ON #id USING"))
 		COMPLETE_WITH_CONST("(");
 
-	/* ALTER POLICY <name> ON <table> WITH CHECK ( */
 	else if (MATCH("ALTER POLICY #id ON #id WITH CHECK"))
 		COMPLETE_WITH_CONST("(");
 
-	/* ALTER RULE <name>, add ON */
 	else if (MATCH("ALTER RULE #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* If we have ALTER RULE <name> ON, then add the correct tablename */
 	else if (MATCH("ALTER RULE [#id] ON"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_rule, CAPTURE(1));
 
-	/* ALTER RULE <name> ON <name> */
 	else if (MATCH("ALTER RULE #id ON #id"))
 		COMPLETE_WITH_CONST("RENAME TO");
 
-	/* ALTER TRIGGER <name>, add ON */
 	else if (MATCH("ALTER TRIGGER #id"))
 		COMPLETE_WITH_CONST("ON");
 
 	else if (MATCH("ALTER TRIGGER [#id] ON"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_trigger, CAPTURE(1));
 
-//  !!! This duplicates with the entry just above
-//	/*
-//	 * If we have ALTER TRIGGER <sth> ON, then add the correct tablename
-//	 */
-//	else if (MATCH("ALTER TRIGGER #id ON"))
-//		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
-
-	/* ALTER TRIGGER <name> ON <name> */
 	else if (MATCH("ALTER TRIGGER #id ON #id"))
 		COMPLETE_WITH_CONST("RENAME TO");
 
-	/*
-	 * If we detect ALTER TABLE <name>, suggest sub commands
-	 */
 	else if (MATCH("ALTER TABLE #id"))
 	{
 		static const char *const list_ALTER2[] =
@@ -1514,7 +1454,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTER2);
 	}
-	/* ALTER TABLE xxx ENABLE */
 	else if (MATCH("ALTER TABLE #id ENABLE"))
 	{
 		static const char *const list_ALTERENABLE[] =
@@ -1541,15 +1480,12 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER TABLE [#id] ENABLE #kwd TRIGGER"))
 		COMPLETE_WITH_QUERY(Query_for_trigger_of_table, CAPTURE(1));
 
-	/* ALTER TABLE xxx INHERIT */
 	else if (MATCH("ALTER TABLE #id INHERIT"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
 
-	/* ALTER TABLE xxx NO INHERIT */
 	else if (MATCH("ALTER TABLE #id NO INHERIT"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
 
-	/* ALTER TABLE xxx DISABLE */
 	else if (MATCH("ALTER TABLE #id DISABLE"))
 	{
 		static const char *const list_ALTERDISABLE[] =
@@ -1571,33 +1507,24 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_DISABLERLS);
 	}
 
-	/* ALTER TABLE xxx ALTER */
 	else if (MATCH("ALTER TABLE [#id] ALTER"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), " UNION SELECT 'COLUMN' UNION SELECT 'CONSTRAINT'");
 
-	/* ALTER TABLE xxx RENAME */
 	else if (MATCH("ALTER TABLE [#id] RENAME"))
 		COMPLETE_WITH_ATTR(CAPTURE(1),
 						   " UNION SELECT 'COLUMN'"
 						   " UNION SELECT 'CONSTRAINT'"
 						   " UNION SELECT 'TO'");
 
-	/*
-	 * If we have TABLE <sth> ALTER COLUMN|RENAME COLUMN, provide list of
-	 * columns
-	 */
 	else if (MATCH("TABLE [#id] {ALTER|RENAME} COLUMN"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/* ALTER TABLE xxx RENAME yyy */
 	else if (MATCH("TABLE #id RENAME !CONSTRAINT|TO"))
 		COMPLETE_WITH_CONST("TO");
 
-	/* ALTER TABLE xxx RENAME COLUMN/CONSTRAINT yyy */
 	else if (MATCH("TABLE #id RENAME {COLUMN|CONSTRAINT} !TO"))
 		COMPLETE_WITH_CONST("TO");
 
-	/* If we have TABLE <sth> DROP, provide COLUMN or CONSTRAINT */
 	else if (MATCH("TABLE #id DROP"))
 	{
 		static const char *const list_TABLEDROP[] =
@@ -1605,18 +1532,12 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_TABLEDROP);
 	}
-	/* If we have ALTER TABLE <sth> DROP COLUMN, provide list of columns */
 	else if (MATCH("ALTER TABLE [#id] DROP COLUMN"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/*
-	 * If we have ALTER TABLE <sth> ALTER|DROP|RENAME|VALIDATE CONSTRAINT,
-	 * provide list of constraints
-	 */
 	else if (MATCH("ALTER TABLE [#id] {DROP|RENAME|VALIDATE} CONSTRAINT"))
 		COMPLETE_WITH_QUERY(Query_for_constraint_of_table, CAPTURE(1));
 
-	/* ALTER TABLE ALTER [COLUMN] <foo> */
 	else if (MATCH("ALTER TABLE #id ALTER {COLUMN }? #id"))
 	{
 		static const char *const list_COLUMNALTER[] =
@@ -1624,7 +1545,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_COLUMNALTER);
 	}
-	/* ALTER TABLE ALTER [COLUMN] <foo> SET */
 	else if (MATCH("ALTER TABLE #id ALTER {COLUMN }? #id SET"))
 	{
 		static const char *const list_COLUMNSET[] =
@@ -1632,7 +1552,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_COLUMNSET);
 	}
-	/* ALTER TABLE ALTER [COLUMN] <foo> SET ( */
 	else if (MATCH("ALTER TABLE #id ALTER {COLUMN }? #id SET ("))
 	{
 		static const char *const list_COLUMNOPTIONS[] =
@@ -1640,7 +1559,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_COLUMNOPTIONS);
 	}
-	/* ALTER TABLE ALTER [COLUMN] <foo> SET STORAGE */
 	else if (MATCH("ALTER TABLE #id ALTER {COLUMN }? #id SET STORAGE"))
 	{
 		static const char *const list_COLUMNSTORAGE[] =
@@ -1648,7 +1566,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_COLUMNSTORAGE);
 	}
-	/* ALTER TABLE ALTER [COLUMN] <foo> DROP */
 	else if (MATCH("ALTER TABLE #id ALTER {COLUMN }? #id DROP"))
 	{
 		static const char *const list_COLUMNDROP[] =
@@ -1662,7 +1579,6 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("ALTER TABLE [#id] CLUSTER ON"))
 		COMPLETE_WITH_QUERY(Query_for_index_of_table, CAPTURE(1));
 
-	/* If we have TABLE <sth> SET, provide list of attributes and '(' */
 	else if (MATCH("ALTER TABLE #id SET"))
 	{
 		static const char *const list_TABLESET[] =
@@ -1670,11 +1586,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_TABLESET);
 	}
-	/* If we have TABLE <sth> SET TABLESPACE provide a list of tablespaces */
 	else if (MATCH("ALTER TABLE #id SET TABLESPACE"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tablespaces, NULL);
 
-	/* If we have TABLE <sth> SET WITHOUT provide CLUSTER or OIDS */
 	else if (MATCH("ALTER TABLE #id SET WITHOUT"))
 	{
 		static const char *const list_TABLESET2[] =
@@ -1682,11 +1596,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_TABLESET2);
 	}
-	/* ALTER TABLE <foo> RESET */
 	else if (MATCH("ALTER TABLE #id RESET"))
 		COMPLETE_WITH_CONST("(");
 
-	/* ALTER TABLE <foo> SET|RESET ( */
 	else if (MATCH("ALTER TABLE #id {RE}?SET("))
 	{
 		static const char *const list_TABLEOPTIONS[] =
@@ -1740,7 +1652,6 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("TABLE #id REPLICA"))
 		COMPLETE_WITH_CONST("IDENTITY");
 
-	/* ALTER TABLESPACE <foo> with RENAME TO, OWNER TO, SET, RESET */
 	else if (MATCH("ALTER TABLESPACE #id"))
 	{
 		static const char *const list_ALTERTSPC[] =
@@ -1748,11 +1659,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERTSPC);
 	}
-	/* ALTER TABLESPACE <foo> SET|RESET */
 	else if (MATCH("ALTER TABLESPACE #id {RE}?SET"))
 		COMPLETE_WITH_CONST("(");
 
-	/* ALTER TABLESPACE <foo> SET|RESET ( */
 	else if (MATCH("ALTER TABLESPACE #id {RE}?SET("))
 	{
 		static const char *const list_TABLESPACEOPTIONS[] =
@@ -1761,7 +1670,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_TABLESPACEOPTIONS);
 	}
 
-	/* ALTER TEXT SEARCH */
 	else if (MATCH("ALTER TEXT SEARCH"))
 	{
 		static const char *const list_ALTERTEXTSEARCH[] =
@@ -1793,7 +1701,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERTEXTSEARCH4);
 	}
 
-	/* complete ALTER TYPE <foo> with actions */
 	else if (MATCH("ALTER TYPE #id"))
 	{
 		static const char *const list_ALTERTYPE[] =
@@ -1802,7 +1709,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERTYPE);
 	}
-	/* complete ALTER TYPE <foo> ADD with actions */
 	else if (MATCH("ALTER TYPE #id ADD"))
 	{
 		static const char *const list_ALTERTYPE[] =
@@ -1810,7 +1716,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERTYPE);
 	}
-	/* ALTER TYPE <foo> RENAME	*/
 	else if (MATCH("ALTER TYPE #id RENAME"))
 	{
 		static const char *const list_ALTERTYPE[] =
@@ -1818,22 +1723,15 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERTYPE);
 	}
-	/* ALTER TYPE xxx RENAME ATTRIBUTE yyy */
 	else if (MATCH("TYPE #id RENAME ATTRIBUTE #id"))
 		COMPLETE_WITH_CONST("TO");
 
-	/*
-	 * If we have TYPE <sth> ALTER/DROP/RENAME ATTRIBUTE, provide list of
-	 * attributes
-	 */
 	else if (MATCH("TYPE [#id] {ALTER|DROP|RENAME} ATTRIBUTE"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/* ALTER TYPE ALTER ATTRIBUTE <foo> */
 	else if (MATCH("ALTER ATTRIBUTE #id"))
 		COMPLETE_WITH_CONST("TYPE");
 
-	/* complete ALTER GROUP <foo> */
 	else if (MATCH("ALTER GROUP #id"))
 	{
 		static const char *const list_ALTERGROUP[] =
@@ -1841,11 +1739,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_ALTERGROUP);
 	}
-	/* complete ALTER GROUP <foo> ADD|DROP with USER */
 	else if (MATCH("ALTER GROUP #id {ADD|DROP}"))
 		COMPLETE_WITH_CONST("USER");
 
-	/* complete {ALTER} GROUP <foo> ADD|DROP USER with a user name */
 	else if (MATCH("ALTER GROUP #id {ADD|DROP} USER"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
 
@@ -1878,37 +1774,22 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_TRANS);
 	}
 /* CLUSTER */
-
-	/*
-	 * If the previous word is CLUSTER and not WITHOUT produce list of tables
-	 */
 	else if (MATCH(" !WITHOUT CLUSTER"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm,
 								   "UNION SELECT 'VERBOSE'");
 
-	/*
-	 * If the previous words are CLUSTER VERBOSE produce list of tables
-	 */
 	else if (MATCH("CLUSTER VERBOSE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
 
-	/* If we have CLUSTER <sth>, then add "USING" */
 	else if (MATCH("CLUSTER !ON|VERBOSE"))
 		COMPLETE_WITH_CONST("USING");
 
-	/* If we have CLUSTER VERBOSE <sth>, then add "USING" */
 	else if (MATCH("CLUSTER VERBOSE #id"))
 		COMPLETE_WITH_CONST("USING");
 
-	/*
-	 * If we have CLUSTER <sth> USING, then add the index as well.
-	 */
 	else if (MATCH("CLUSTER [#id] USING"))
 		COMPLETE_WITH_QUERY(Query_for_index_of_table, CAPTURE(1));
 
-	/*
-	 * If we have CLUSTER VERBOSE <sth> USING, then add the index as well.
-	 */
 	else if (MATCH("CLUSTER VERBOSE [#id] USING"))
 		COMPLETE_WITH_QUERY(Query_for_index_of_table, CAPTURE(1));
 
@@ -1962,15 +1843,9 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("IS");
 
 /* COPY */
-
-	/*
-	 * If we have COPY [BINARY] (which you'd have to type yourself), offer
-	 * list of tables (Also cover the analogous backslash command)
-	 */
 	else if (MATCH("\\?COPY{ BINARY}?"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-	/* If we have COPY|BINARY <sth>, complete it with "TO" or "FROM" */
 	else if (MATCH("\\?COPY{ BINARY}? #id"))
 	{
 		static const char *const list_FROMTO[] =
@@ -1978,14 +1853,12 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_FROMTO);
 	}
-	/* If we have COPY|BINARY <sth> FROM|TO, complete with filename */
 	else if (MATCH("\\?COPY{ BINARY}? #id {FROM|TO}"))
 	{
 		completion_charp = "";
 		matches = completion_matches(text, complete_from_files);
 	}
 
-	/* Handle COPY|BINARY <sth> FROM|TO filename */
 	else if (MATCH("\\?COPY{ BINARY}? #id {FROM|TO} #nwb"))
 	{
 		static const char *const list_COPY[] =
@@ -1994,7 +1867,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_COPY);
 	}
 
-	/* Handle COPY|BINARY <sth> FROM|TO filename CSV */
 	else if (MATCH("{FROM|TO} #nwb CSV"))
 	{
 		static const char *const list_CSV[] =
@@ -2003,7 +1875,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CSV);
 	}
 
-	/* CREATE DATABASE */
 	else if (MATCH("CREATE DATABASE #id"))
 	{
 		static const char *const list_DATABASE[] =
@@ -2017,12 +1888,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("CREATE DATABASE #id TEMPLATE"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_template_databases, NULL);
 
-	/* CREATE EXTENSION */
-	/* Complete with available extensions rather than installed ones. */
 	else if (MATCH("CREATE EXTENSION"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_available_extensions, NULL);
 
-	/* CREATE EXTENSION <name> */
 	else if (MATCH("CREATE EXTENSION #id"))
 	{
 		static const char *const list_CREATE_EXTENSION[] =
@@ -2030,12 +1898,11 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATE_EXTENSION);
 	}
-	/* CREATE EXTENSION <name> VERSION */
+
 	else if (MATCH("CREATE EXTENSION [#id] VERSION"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_available_extension_versions,
 							CAPTURE(1));
 
-	/* CREATE FOREIGN */
 	else if (MATCH("CREATE FOREIGN"))
 	{
 		static const char *const list_CREATE_FOREIGN[] =
@@ -2044,7 +1911,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATE_FOREIGN);
 	}
 
-	/* CREATE FOREIGN DATA WRAPPER */
 	else if (MATCH("CREATE FOREIGN DATA WRAPPER #id"))
 	{
 		static const char *const list_CREATE_FOREIGN_DATA_WRAPPER[] =
@@ -2053,25 +1919,21 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATE_FOREIGN_DATA_WRAPPER);
 	}
 
-	/* CREATE INDEX */
 	/* First off we complete CREATE UNIQUE with "INDEX" */
 	else if (MATCH("CREATE UNIQUE"))
 		COMPLETE_WITH_CONST("INDEX");
 
-	/* If we have CREATE|UNIQUE INDEX, then add "ON" and existing indexes */
 	else if (MATCH("CREATE {UNIQUE }? INDEX #id"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   " UNION SELECT 'ON'"
 								   " UNION SELECT 'CONCURRENTLY'");
-	/* Complete ... INDEX [<name>] ON with a list of tables  */
+
 	else if (MATCH("INDEX {CONCURRENTLY }? #id ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
 
-	/* If we have CREATE|UNIQUE INDEX <sth> CONCURRENTLY, then add "ON" */
 	else if (MATCH("INDEX #id CONCURRENTLY"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* If we have CREATE|UNIQUE INDEX <sth>, then add "ON" or "CONCURRENTLY" */
 	else if (MATCH("CREATE {UNIQUE }? INDEX #id"))
 	{
 		static const char *const list_CREATE_INDEX[] =
@@ -2094,11 +1956,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("INDEX #id {CONCURRENTLY }? ON [#id]("))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/* same if you put in USING */
 	else if (MATCH("ON [#id] USING #id("))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/* Complete USING with an index method */
 	else if (MATCH("INDEX #id {#nwb }* ON #id USING"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_access_methods, NULL);
 
@@ -2106,15 +1966,12 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("(");
 
 	/* CREATE POLICY */
-	/* Complete "CREATE POLICY <name> ON" */
 	else if (MATCH("CREATE POLICY #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* Complete "CREATE POLICY <name> ON <table>" */
 	else if (MATCH("CREATE POLICY #id ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-	/* Complete "CREATE POLICY <name> ON <table> FOR|TO|USING|WITH CHECK" */
 	else if (MATCH("CREATE POLICY #id ON #id"))
 	{
 		static const char *const list_POLICYOPTIONS[] =
@@ -2122,11 +1979,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_POLICYOPTIONS);
 	}
-
-	/*
-	 * Complete "CREATE POLICY <name> ON <table> FOR
-	 * ALL|SELECT|INSERT|UPDATE|DELETE"
-	 */
 	else if (MATCH("CREATE POLICY #id ON #id FOR"))
 	{
 		static const char *const list_POLICYCMDS[] =
@@ -2134,7 +1986,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_POLICYCMDS);
 	}
-	/* Complete "CREATE POLICY <name> ON <table> FOR INSERT TO|WITH CHECK" */
 	else if (MATCH("CREATE POLICY #id ON #id FOR INSERT"))
 	{
 		static const char *const list_POLICYOPTIONS[] =
@@ -2142,11 +1993,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_POLICYOPTIONS);
 	}
-
-	/*
-	 * Complete "CREATE POLICY <name> ON <table> FOR SELECT TO|USING" Complete
-	 * "CREATE POLICY <name> ON <table> FOR DELETE TO|USING"
-	 */
 	else if (MATCH("CREATE POLICY #id ON #id FOR {SELECT|DELETE}"))
 	{
 		static const char *const list_POLICYOPTIONS[] =
@@ -2154,12 +2000,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_POLICYOPTIONS);
 	}
-
-	/*
-	 * Complete "CREATE POLICY <name> ON <table> FOR ALL TO|USING|WITH CHECK"
-	 * Complete "CREATE POLICY <name> ON <table> FOR UPDATE TO|USING|WITH
-	 * CHECK"
-	 */
 	else if (MATCH("CREATE POLICY #id ON #id FOR {ALL|UPDATE}"))
 	{
 		static const char *const list_POLICYOPTIONS[] =
@@ -2167,24 +2007,19 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_POLICYOPTIONS);
 	}
-	/* Complete "CREATE POLICY <name> ON <table> TO <role>" */
 	else if (MATCH("CREATE POLICY #id ON #id TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	/* Complete "CREATE POLICY <name> ON <table> USING (" */
 	else if (MATCH("CREATE POLICY #id ON #id USING"))
 		COMPLETE_WITH_CONST("(");
 
 /* CREATE RULE */
-	/* Complete "CREATE RULE <sth>" with "AS" */
 	else if (MATCH("CREATE RULE #id"))
 		COMPLETE_WITH_CONST("AS");
 
-	/* Complete "CREATE RULE <sth> AS with "ON" */
 	else if (MATCH("CREATE RULE #id AS"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* Complete "RULE * AS ON" with SELECT|UPDATE|DELETE|INSERT */
 	else if (MATCH("RULE #id AS ON"))
 	{
 		static const char *const rule_events[] =
@@ -2192,15 +2027,12 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(rule_events);
 	}
-	/* Complete "AS ON <sth with a 'T' :)>" with a "TO" */
 	else if (MATCH("AS ON {SELECT|UPDATE|INSERT|DELETE}"))
 		COMPLETE_WITH_CONST("TO");
 
-	/* Complete "AS ON <sth> TO" with a table name */
 	else if (MATCH("AS ON #kwd TO"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-/* CREATE TEMP/TEMPORARY SEQUENCE <name> */
 	else if (MATCH("CREATE {TEMP{ORARY}? }? SEQUENCE #id"))
 	{
 		static const char *const list_CREATESEQUENCE[] =
@@ -2209,7 +2041,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATESEQUENCE);
 	}
-/* CREATE TEMP/TEMPORARY SEQUENCE <name> NO */
 	else if (MATCH("CREATE {TEMP{ORARY}? }? SEQUENCE #id NO"))
 	{
 		static const char *const list_CREATESEQUENCE2[] =
@@ -2218,7 +2049,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATESEQUENCE2);
 	}
 
-/* CREATE SERVER <name> */
 	else if (MATCH("CREATE SERVER #id"))
 	{
 		static const char *const list_CREATE_SERVER[] =
@@ -2228,7 +2058,6 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* CREATE TABLE */
-	/* Complete "CREATE TEMP/TEMPORARY" with the possible temp objects */
 	else if (MATCH("CREATE {TEMP{ORARY}?}"))
 	{
 		static const char *const list_TEMP[] =
@@ -2236,7 +2065,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_TEMP);
 	}
-	/* Complete "CREATE UNLOGGED" with TABLE */
 	else if (MATCH("CREATE UNLOGGED"))
 	{
 		static const char *const list_UNLOGGED[] =
@@ -2253,7 +2081,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATETABLESPACE);
 	}
-	/* Complete CREATE TABLESPACE name OWNER name with "LOCATION" */
 	else if (MATCH("CREATE TABLESPACE #id OWNER"))
 		COMPLETE_WITH_CONST("LOCATION");
 
@@ -2269,7 +2096,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("(");
 
 /* CREATE TRIGGER */
-	/* complete CREATE TRIGGER <name> with BEFORE,AFTER */
 	else if (MATCH("CREATE TRIGGER #id"))
 	{
 		static const char *const list_CREATETRIGGER[] =
@@ -2277,7 +2103,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATETRIGGER);
 	}
-	/* complete CREATE TRIGGER <name> BEFORE,AFTER with an event */
 	else if (MATCH("CREATE TRIGGER #id {BEFORE|AFTER}"))
 	{
 		static const char *const list_CREATETRIGGER_EVENTS[] =
@@ -2285,7 +2110,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATETRIGGER_EVENTS);
 	}
-	/* complete CREATE TRIGGER <name> INSTEAD OF with an event */
 	else if (MATCH("CREATE TRIGGER #id INSTEAD OF"))
 	{
 		static const char *const list_CREATETRIGGER_EVENTS[] =
@@ -2293,7 +2117,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATETRIGGER_EVENTS);
 	}
-	/* complete CREATE TRIGGER <name> BEFORE,AFTER sth with OR,ON */
 	else if (MATCH("CREATE TRIGGER #id {BEFORE|AFTER|INSTEAD_OF} #kwd"))
 	{
 		static const char *const list_CREATETRIGGER2[] =
@@ -2301,23 +2124,15 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_CREATETRIGGER2);
 	}
-
-	/*
-	 * complete CREATE TRIGGER <name> BEFORE,AFTER event ON with a list of
-	 * tables
-	 */
 	else if (MATCH("TRIGGER #id {BEFORE|AFTER} #kwd ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-	/* complete CREATE TRIGGER ... INSTEAD OF event ON with a list of views */
 	else if (MATCH("INSTEAD OF #kwd ON"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_views, NULL);
 
-	/* complete CREATE TRIGGER ... EXECUTE with PROCEDURE */
 	else if (MATCH("CREATE TRIGGER {#nwb }+ EXECUTE"))
 		COMPLETE_WITH_CONST("PROCEDURE");
 
-/* CREATE ROLE,USER,GROUP <name> */
 	else if (MATCH("CREATE {{USER !MAPPING_}|ROLE |GROUP } #id"))
 	{
 		static const char *const list_CREATEROLE[] =
@@ -2331,7 +2146,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATEROLE);
 	}
 
-/* CREATE ROLE,USER,GROUP <name> WITH */
 	else if (MATCH("CREATE {ROLE|GROUP|USER} #id WITH"))
 	{
 		/* Similar to the above, but don't complete "WITH" again. */
@@ -2346,14 +2160,9 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_CREATEROLE_WITH);
 	}
 
-	/*
-	 * complete CREATE ROLE,USER,GROUP <name> ENCRYPTED,UNENCRYPTED with
-	 * PASSWORD
-	 */
 	else if (MATCH("CREATE {ROLE|GROUP|USER} #id {UN}?ENCRYPTED"))
 		COMPLETE_WITH_CONST("PASSWORD");
 
-	/* complete CREATE ROLE,USER,GROUP <name> IN with ROLE,GROUP */
 	else if (MATCH("CREATE {ROLE|GROUP|USER} #id IN"))
 	{
 		static const char *const list_CREATEROLE3[] =
@@ -2363,11 +2172,9 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* CREATE VIEW */
-	/* Complete CREATE VIEW <name> with AS */
 	else if (MATCH("CREATE VIEW #id"))
 		COMPLETE_WITH_CONST("AS");
 
-	/* Complete "CREATE VIEW <sth> AS with "SELECT" */
 	else if (MATCH("CREATE VIEW #id AS"))
 		COMPLETE_WITH_CONST("SELECT");
 
@@ -2375,11 +2182,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("CREATE MATERIALIZED"))
 		COMPLETE_WITH_CONST("VIEW");
 
-	/* Complete CREATE MATERIALIZED VIEW <name> with AS */
 	else if (MATCH("CREATE MATERIALIZED VIEW #id"))
 		COMPLETE_WITH_CONST("AS");
 
-	/* Complete "CREATE MATERIALIZED VIEW <sth> AS with "SELECT" */
 	else if (MATCH("CREATE MATERIALIZED VIEW #id AS"))
 		COMPLETE_WITH_CONST("SELECT");
 
@@ -2387,11 +2192,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("CREATE EVENT"))
 		COMPLETE_WITH_CONST("TRIGGER");
 
-	/* Complete CREATE EVENT TRIGGER <name> with ON */
 	else if (MATCH("CREATE EVENT TRIGGER #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* Complete CREATE EVENT TRIGGER <name> ON with event_type */
 	else if (MATCH("CREATE EVENT TRIGGER #id ON"))
 	{
 		static const char *const list_CREATE_EVENT_TRIGGER_ON[] =
@@ -2428,11 +2231,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("DELETE"))
 		COMPLETE_WITH_CONST("FROM");
 
-	/* Complete DELETE FROM with a list of tables */
 	else if (MATCH("DELETE FROM"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_updatables, NULL);
 
-	/* Complete DELETE FROM <table> */
 	else if (MATCH("DELETE FROM #id"))
 	{
 		static const char *const list_DELETE[] =
@@ -2452,10 +2253,6 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* DO */
-
-	/*
-	 * Complete DO with LANGUAGE.
-	 */
 	else if (MATCH("DO"))
 	{
 		static const char *const list_DO[] =
@@ -2465,11 +2262,9 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* DROP (when not the previous word) */
-	/* DROP AGGREGATE */
 	else if (MATCH("DROP AGGREGATE #id"))
 		COMPLETE_WITH_CONST("(");
 
-	/* DROP object with CASCADE / RESTRICT */
 	else if (MATCH("DROP {{{COLLATION|CONVERSION|DOMAIN|EXTENSION|[FUNCTION]|INDEX|LANGUAGE|SCHEMA|SEQUENCE|SERVER|TABLE|TYPE|VIEW|{EVENT TRIGGER}|{FOREGN DATA WRAPPER}|{TEXT SEARCH {CONFIGURATION|DICTIONARY|PARSER|TEMPLATE}}} #id }|{AGGREGATE #id(..)}}"))
 	{
 		if (pg_strcasecmp(CAPTURE(1), "FUNCTION") == 0)
@@ -2492,7 +2287,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(drop_CREATE_FOREIGN);
 	}
 
-	/* DROP MATERIALIZED VIEW */
 	else if (MATCH("DROP MATERIALIZED"))
 		COMPLETE_WITH_CONST("VIEW");
 
@@ -2502,7 +2296,6 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("DROP {AGGREGATE|FUNCTION} [#id]("))
 		COMPLETE_WITH_FUNCTION_ARG(CAPTURE(1));
 
-	/* DROP OWNED BY */
 	else if (MATCH("DROP OWNED"))
 		COMPLETE_WITH_CONST("BY");
 	else if (MATCH("DROP OWNED BY"))
@@ -2517,7 +2310,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_ALTERTEXTSEARCH);
 	}
 
-	/* DROP TRIGGER */
 	else if (MATCH("DROP TRIGGER #id"))
 		COMPLETE_WITH_CONST("ON");
 	else if (MATCH("DROP TRIGGER [#id] ON"))
@@ -2530,26 +2322,21 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_DROPCR);
 	}
 
-	/* DROP EVENT TRIGGER */
 	else if (MATCH("DROP EVENT"))
 		COMPLETE_WITH_CONST("TRIGGER");
 
 	else if (MATCH("DROP_EVENT TRIGGER"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_event_triggers, NULL);
 
-	/* DROP POLICY <name>  */
 	else if (MATCH("DROP POLICY"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_policies, NULL);
 
-	/* DROP POLICY <name> ON */
 	else if (MATCH("DROP POLICY #id"))
 		COMPLETE_WITH_CONST("ON");
 
-	/* DROP POLICY <name> ON <table> */
 	else if (MATCH("DROP POLICY [#id] ON"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_policy, CAPTURE(1));
 
-	/* DROP RULE */
 	else if (MATCH("DROP RULE #id"))
 		COMPLETE_WITH_CONST("ON");
 
@@ -2596,7 +2383,6 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* FETCH && MOVE */
-	/* Complete FETCH with one of FORWARD, BACKWARD, RELATIVE */
 	else if (MATCH("{FETCH|MOVE}"))
 	{
 		static const char *const list_FETCH1[] =
@@ -2604,7 +2390,6 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(list_FETCH1);
 	}
-	/* Complete FETCH <sth> with one of ALL, NEXT, PRIOR */
 	else if (MATCH("{FETCH|MOVE} #id"))
 	{
 		static const char *const list_FETCH2[] =
@@ -2627,20 +2412,16 @@ psql_completion(const char *text, int start, int end)
 	}
 
 /* FOREIGN DATA WRAPPER */
-	/* applies in ALTER/DROP FDW and in CREATE SERVER */
 	else if (MATCH("{ALTER|DROP} FOREIGN DATA WRAPPER"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_fdws, NULL);
 
-/* FOREIGN TABLE */
 	else if (MATCH("CREATE FOREIGN TABLE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_foreign_tables, NULL);
 
-/* FOREIGN SERVER */
 	else if (MATCH("FOREIGN SERVER"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_servers, NULL);
 
 /* GRANT && REVOKE */
-	/* Complete GRANT/REVOKE with a list of roles and privileges */
 	else if (MATCH("{GRANT|REVOKE}"))
 	{
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles
@@ -2659,11 +2440,6 @@ psql_completion(const char *text, int start, int end)
 							" UNION SELECT 'ALL'",
 							NULL);
 	}
-
-	/*
-	 * Complete GRANT/REVOKE <privilege> with "ON", GRANT/REVOKE <role> with
-	 * TO/FROM
-	 */
 	else if (MATCH("{GRANT|REVOKE} {SELECT|INSERT|UPDATE|DELETE|TRUNCATE|REFERENCES|TRIGGER|CREATE|CONNECT|TEMP{ORARY}?|EXECUTE|USAGE|ALL}"))
 			COMPLETE_WITH_CONST("ON");
 	else if (MATCH("GRANT #id"))
@@ -2731,7 +2507,6 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_CONST("FROM");
 	}
 
-	/* Complete "GRANT/REVOKE * ON ALL * IN SCHEMA *" with TO/FROM */
 	else if (MATCH("[GRANT|REVOKE] #kwd ON ALL #kwd IN SCHEMA #id"))
 	{
 		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
@@ -2740,7 +2515,6 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_CONST("FROM");
 	}
 
-	/* Complete "GRANT/REVOKE * ON FOREIGN DATA WRAPPER *" with TO/FROM */
 	else if (MATCH("[GRANT|REVOKE] #kwd ON FOREIGN DATA WRAPPER #id"))
 	{
 		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
@@ -2749,7 +2523,6 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_CONST("FROM");
 	}
 
-	/* Complete "GRANT/REVOKE * ON FOREIGN SERVER *" with TO/FROM */
 	else if (MATCH("[GRANT|REVOKE] #kwd ON FOREIGN SERVER #id"))
 	{
 		if (pg_strcasecmp(CAPTURE(1), "GRANT") == 0)
@@ -2758,35 +2531,24 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_CONST("FROM");
 	}
 
-	/*
-	 * Complete "GRANT/REVOKE ... TO/FROM" with username, PUBLIC,
-	 * CURRENT_USER, or SESSION_USER.
-	 */
 	else if (MATCH("{GRANT|REVOKE}{ #nwb}+ {TO|FROM}"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-	/* Complete "GRANT/REVOKE * ON * *" with TO/FROM */
 	else if (MATCH("GRANT #kwd ON #kwd #id"))
 		COMPLETE_WITH_CONST("TO");
 
 	else if (MATCH("REVOKE #kwd ON #kwd #id"))
 		COMPLETE_WITH_CONST("FROM");
 
-	/*
-	 * Complete "GRANT/REVOKE * TO/FROM" with username, PUBLIC,
-	 * CURRENT_USER, or SESSION_USER.
-	 */
 	else if (MATCH("GRANT #kwd TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
 	else if (MATCH("REVOKE #kwd FROM"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_grant_roles, NULL);
 
-/* GROUP BY */
 	else if (MATCH("FROM #id GROUP"))
 		COMPLETE_WITH_CONST("BY");
 
-/* IMPORT FOREIGN SCHEMA */
 	else if (MATCH("IMPORT"))
 		COMPLETE_WITH_CONST("FOREIGN SCHEMA");
 
@@ -2794,22 +2556,15 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("SCHEMA");
 
 /* INSERT */
-	/* Complete INSERT with "INTO" */
 	else if (MATCH("INSERT"))
 		COMPLETE_WITH_CONST("INTO");
 
-	/* Complete INSERT INTO with table names */
 	else if (MATCH("INSERT INTO"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_updatables, NULL);
 
-	/* Complete "INSERT INTO <table> (" with attribute names */
 	else if (MATCH("INSERT INTO [#id]("))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-	/*
-	 * Complete INSERT INTO <table> with "(" or "VALUES" or "SELECT" or
-	 * "TABLE" or "DEFAULT VALUES"
-	 */
 	else if (MATCH("INSERT INTO #id"))
 	{
 		static const char *const list_INSERT[] =
@@ -2818,10 +2573,6 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_INSERT);
 	}
 
-	/*
-	 * Complete INSERT INTO <table> (attribs) with "VALUES" or "SELECT" or
-	 * "TABLE"
-	 */
 	else if (MATCH("INSERT INTO #id(..)"))
 	{
 		static const char *const list_INSERT[] =
@@ -2830,12 +2581,10 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(list_INSERT);
 	}
 
-	/* Insert an open parenthesis after "VALUES" */
 	else if (MATCH("!DEFAULT VALUES"))
 		COMPLETE_WITH_CONST("(");
 
 /* LOCK */
-	/* Complete LOCK [TABLE] with a list of tables */
 	else if (MATCH("LOCK"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,
 								   " UNION SELECT 'TABLE'");
@@ -2845,11 +2594,9 @@ psql_completion(const char *text, int start, int end)
 
 	/* For the following, handle the case of a single table only for now */
 
-	/* Complete LOCK [TABLE] <table> with "IN" */
 	else if (MATCH("LOCK{ TABLE}? !TABLE"))
 		COMPLETE_WITH_CONST("IN");
 
-	/* Complete LOCK [TABLE] <table> IN with a lock mode */
 	else if (MATCH("LOCK{ TABLE}? #id IN"))
 	{
 		static const char *const lock_modes[] =
@@ -2862,26 +2609,21 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST(lock_modes);
 	}
 
-/* NOTIFY */
 	else if (MATCH("NOTIFY"))
 		COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s'", NULL);
 
-/* OPTIONS */
 	else if (MATCH("OPTIONS"))
 		COMPLETE_WITH_CONST("(");
 
-/* OWNER TO  - complete with available roles */
 	else if (MATCH("OWNER TO"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
 
-/* ORDER BY */
 	else if (MATCH("FROM #id ORDER"))
 		COMPLETE_WITH_CONST("BY");
 
 	else if (MATCH("FROM [#id] ORDER BY"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-/* PREPARE xx AS */
 	else if (MATCH("PREPARE #id AS"))
 	{
 		static const char *const list_PREPARE[] =
@@ -2973,7 +2715,6 @@ psql_completion(const char *text, int start, int end)
 	/* naah . . . */ 
 
 /* SET, RESET, SHOW */
-	/* Complete with a variable name */
 	else if (MATCH("^{RE}?SET"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_set_vars, NULL);
 	else if (MATCH("SHOW"))
@@ -3033,10 +2774,9 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(constraint_list);
 	}
-	/* Complete SET ROLE */
 	else if (MATCH("SET ROLE"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles, NULL);
-	/* Complete SET SESSION with AUTHORIZATION or CHARACTERISTICS... */
+
 	else if (MATCH("SET SESSION"))
 	{
 		static const char *const my_list[] =
@@ -3044,15 +2784,14 @@ psql_completion(const char *text, int start, int end)
 
 		COMPLETE_WITH_LIST(my_list);
 	}
-	/* Complete SET SESSION AUTHORIZATION with username */
 	else if (MATCH("SET SESSION AUTHORIZATION"))
 		COMPLETE_WITH_QUERY(Query_for_list_of_roles " UNION SELECT 'DEFAULT'",
 							NULL);
-	/* Complete RESET SESSION with AUTHORIZATION */
+
 	else if (MATCH("RESET SESSION"))
 		COMPLETE_WITH_CONST("AUTHORIZATION");
 
-	/* Complete SET <var> with "TO" */
+
 	else if (MATCH("^{!UPDATE }*SET !TABLESPACE|SCHEMA|="))
 		COMPLETE_WITH_CONST("TO");
 
@@ -3112,7 +2851,6 @@ psql_completion(const char *text, int start, int end)
 		}
 	}
 
-/* START TRANSACTION */
 	else if (MATCH("START"))
 		COMPLETE_WITH_CONST("TRANSACTION");
 
@@ -3127,19 +2865,16 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("TABLESAMPLE #id"))
 		COMPLETE_WITH_CONST("(");
 
-/* TRUNCATE */
 	else if (MATCH("TRUNCATE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
 
-/* UNLISTEN */
 	else if (MATCH("UNLISTEN"))
 		COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(channel) FROM pg_catalog.pg_listening_channels() AS channel WHERE substring(pg_catalog.quote_ident(channel),1,%d)='%s' UNION SELECT '*'", NULL);
 
 /* UPDATE */
-	/* If prev. word is UPDATE suggest a list of tables */
 	else if (MATCH("UPDATE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_updatables, NULL);
-	/* Complete UPDATE <table> with "SET" */
+
 	else if (MATCH("UPDATE #id"))
 		COMPLETE_WITH_CONST("SET");
 
@@ -3151,11 +2886,9 @@ psql_completion(const char *text, int start, int end)
 	else if (MATCH("[#id] SET"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-/* UPDATE xx SET yy = */
 	else if (MATCH("UPDATE #id SET #id"))
 		COMPLETE_WITH_CONST("=");
 
-/* USER MAPPING */
 	else if (MATCH("{ALTER|DROP|CREATE} USER MAPPING"))
 		COMPLETE_WITH_CONST("FOR");
 
@@ -3209,12 +2942,10 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_CONST("RECURSIVE");
 
 /* ANALYZE */
-	/* If the previous word is ANALYZE, produce list of tables */
 	else if (MATCH("ANALYZE"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tmf, NULL);
 
 /* WHERE */
-	/* Simple case of the word before the where being the table name */
 	else if (MATCH("[#id] WHERE"))
 		COMPLETE_WITH_ATTR(CAPTURE(1), "");
 
-- 
1.8.3.1

