diff options
| author | Peter Eisentraut | 2018-04-26 15:52:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2018-04-27 15:37:43 +0000 |
| commit | d4f16d50713077e69f8833df6b99d1eab0be1c33 (patch) | |
| tree | f9acf7a056f6db6ba9b4e0059710276bb40d37aa /src/tools/pgindent | |
| parent | a2ada08d4c0afa2d1f678ba7fb03ccc065f3a57b (diff) | |
perltidy: Add option --nooutdent-long-quotes
Diffstat (limited to 'src/tools/pgindent')
| -rw-r--r-- | src/tools/pgindent/perltidyrc | 1 | ||||
| -rwxr-xr-x | src/tools/pgindent/pgindent | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/pgindent/perltidyrc b/src/tools/pgindent/perltidyrc index 802b5df37b4..e62f3c9c78b 100644 --- a/src/tools/pgindent/perltidyrc +++ b/src/tools/pgindent/perltidyrc @@ -5,6 +5,7 @@ --entab-leading-whitespace=4 --keep-old-blank-lines=2 --maximum-line-length=78 +--nooutdent-long-quotes --nospace-for-semicolon --opening-brace-on-new-line --output-line-ending=unix diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index fadc3185cab..ce0f43f3672 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -16,7 +16,7 @@ my $INDENT_VERSION = "2.0"; # Our standard indent settings my $indent_opts = -"-bad -bap -bbb -bc -bl -cli1 -cp33 -cdb -nce -d0 -di12 -nfc1 -i4 -l79 -lp -lpl -nip -npro -sac -tpg -ts4"; + "-bad -bap -bbb -bc -bl -cli1 -cp33 -cdb -nce -d0 -di12 -nfc1 -i4 -l79 -lp -lpl -nip -npro -sac -tpg -ts4"; my $devnull = File::Spec->devnull; @@ -82,7 +82,7 @@ sub check_indent if (`$indent --version` !~ m/ $INDENT_VERSION$/) { print STDERR -"You do not appear to have $indent version $INDENT_VERSION installed on your system.\n"; + "You do not appear to have $indent version $INDENT_VERSION installed on your system.\n"; exit 1; } @@ -211,7 +211,7 @@ sub pre_indent my $extern_c_start = '/* Open extern "C" */'; my $extern_c_stop = '/* Close extern "C" */'; $source =~ -s!(^#ifdef[ \t]+__cplusplus.*\nextern[ \t]+"C"[ \t]*\n)\{[ \t]*$!$1$extern_c_start!gm; + s!(^#ifdef[ \t]+__cplusplus.*\nextern[ \t]+"C"[ \t]*\n)\{[ \t]*$!$1$extern_c_start!gm; $source =~ s!(^#ifdef[ \t]+__cplusplus.*\n)\}[ \t]*$!$1$extern_c_stop!gm; # Protect wrapping in CATALOG() |