Phase 3 of pgindent updates.

Don't move parenthesized lines to the left, even if that means they
flow past the right margin.

By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis.  However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent.  That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.

This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

1 files changed, 8 insertions, 8 deletions

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 7554fbb22c3..ad3fe74bbd6 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -1358,8 +1358,8 @@ pg_newlocale_from_collation(Oid collid)
 			collator = ucol_open(collcollate, &status);
 			if (U_FAILURE(status))
 				ereport(ERROR,
-					 (errmsg("could not open collator for locale \"%s\": %s",
-							 collcollate, u_errorName(status))));
+						(errmsg("could not open collator for locale \"%s\": %s",
+								collcollate, u_errorName(status))));
 
 			result->info.icu.locale = strdup(collcollate);
 			result->info.icu.ucol = collator;
@@ -1368,7 +1368,7 @@ pg_newlocale_from_collation(Oid collid)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("ICU is not supported in this build"), \
-			   errhint("You need to rebuild PostgreSQL using --with-icu.")));
+					 errhint("You need to rebuild PostgreSQL using --with-icu.")));
 #endif							/* not USE_ICU */
 		}
 
@@ -1398,13 +1398,13 @@ pg_newlocale_from_collation(Oid collid)
 						(errmsg("collation \"%s\" has version mismatch",
 								NameStr(collform->collname)),
 						 errdetail("The collation in the database was created using version %s, "
-							 "but the operating system provides version %s.",
+								   "but the operating system provides version %s.",
 								   collversionstr, actual_versionstr),
 						 errhint("Rebuild all objects affected by this collation and run "
 								 "ALTER COLLATION %s REFRESH VERSION, "
-					   "or build PostgreSQL with the right library version.",
+								 "or build PostgreSQL with the right library version.",
 								 quote_qualified_identifier(get_namespace_name(collform->collnamespace),
-											 NameStr(collform->collname)))));
+															NameStr(collform->collname)))));
 		}
 
 		ReleaseSysCache(tp);
@@ -1480,8 +1480,8 @@ init_icu_converter(void)
 	conv = ucnv_open(icu_encoding_name, &status);
 	if (U_FAILURE(status))
 		ereport(ERROR,
-			  (errmsg("could not open ICU converter for encoding \"%s\": %s",
-					  icu_encoding_name, u_errorName(status))));
+				(errmsg("could not open ICU converter for encoding \"%s\": %s",
+						icu_encoding_name, u_errorName(status))));
 
 	icu_converter = conv;
 }