From df6b19fbbc20d830de91d9bea68715a39635b568 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 19 May 2023 16:43:57 -0400
Subject: [PATCH] Make agreed-on updates in perltidy options.
Our standard version of perltidy is now 20230309.
Add a --valign-exclusion-list setting to reduce crosstalk
between nearby lines of Perl code.
Also, update instructions for running pgindent
(missed in b16259b3c).
Discussion: https://postgr.es/m/20230428092545.qfb3y5wcu4cm75ur@alvherre.pgsql
---
src/tools/pgindent/README | 8 ++++----
src/tools/pgindent/perltidyrc | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index 43c736b0a11..b2b134ee6a2 100644
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -14,16 +14,16 @@ PREREQUISITES:
sibling directory src/tools/pg_bsd_indent; see the directions
in that directory's README file.
-2) Install perltidy. Please be sure it is version 20170521 (older and newer
+2) Install perltidy. Please be sure it is version 20230309 (older and newer
versions make different formatting choices, and we want consistency).
You can get the correct version from
https://cpan.metacpan.org/authors/id/S/SH/SHANCOCK/
To install, follow the usual install process for a Perl module
("man perlmodinstall" explains it). Or, if you have cpan installed,
this should work:
- cpan SHANCOCK/Perl-Tidy-20170521.tar.gz
+ cpan SHANCOCK/Perl-Tidy-20230309.tar.gz
Or if you have cpanm installed, you can just use:
- cpanm https://cpan.metacpan.org/authors/id/S/SH/SHANCOCK/Perl-Tidy-20170521.tar.gz
+ cpanm https://cpan.metacpan.org/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230309.tar.gz
DOING THE INDENT RUN:
@@ -38,7 +38,7 @@ DOING THE INDENT RUN:
3) Run pgindent on the C files:
- src/tools/pgindent/pgindent
+ src/tools/pgindent/pgindent .
If any files generate errors, restore their original versions with
"git checkout", and see below for cleanup ideas.
diff --git a/src/tools/pgindent/perltidyrc b/src/tools/pgindent/perltidyrc
index 9f09f0a64e3..589d6e1f066 100644
--- a/src/tools/pgindent/perltidyrc
+++ b/src/tools/pgindent/perltidyrc
@@ -14,3 +14,4 @@
--paren-vertical-tightness=2
--paren-vertical-tightness-closing=2
--noblanks-before-comments
+--valign-exclusion-list=", = => =~ |= || && if or qw unless"