From b05173b619c45d9ad859da50bfa78d1fc626fe3d Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Wed, 14 Feb 2024 17:19:42 +0100 Subject: [PATCH v4 1/5] Handle blank-at-eof/blank-at-eol in .editorconfig too For many files in the repo our .gitattributes file is configured to complain about trailing whitespace at the end of a line, as well as not including a final newline at the end of the file. This updates our .editorconfig file, to make editors and IDEs fix these issues automatically on save in the same way for files that are intended to be edited by hand. --- .editorconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.editorconfig b/.editorconfig index d69a3d1dc4..0e7c2048f9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,9 @@ root = true +[*] +trim_trailing_whitespace = true +insert_final_newline = true + [*.{c,h,l,y,pl,pm}] indent_style = tab indent_size = tab @@ -12,3 +16,14 @@ indent_size = 1 [*.xsl] indent_style = space indent_size = 2 + +# Certain data files that contain special whitespace, and other special cases +[*.data] +trim_trailing_whitespace = false +insert_final_newline = unset + +[contrib/pgcrypto/sql/pgp-armor.sql] +trim_trailing_whitespace = false + +[src/backend/catalog/sql_features.txt] +trim_trailing_whitespace = false base-commit: e1b7fde418f2c0ba4ab0d9fbfa801ef62d96397b -- 2.34.1