From 2ac30932a63fb574d1a40f4569900877d74d9361 Mon Sep 17 00:00:00 2001 From: Pasqualino Titto Assini Date: Tue, 29 Sep 2020 12:31:41 +0200 Subject: [PATCH 1/6] Restrict config to haskell file, to avoid affecting Makefiles --- .editorconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index c277dff9a5..1dd89173eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,10 +3,13 @@ root = true +[Makefile] +indent_style = tab + [*] end_of_line = LF -[*] +[*.{hs,lhs}] indent_style = space indent_size = 4 trim_trailing_whitespace = true From 6c946d4adcd020d5edd41aef8b9bb5a5225afb7f Mon Sep 17 00:00:00 2001 From: Pasqualino 'Titto' Assini Date: Thu, 8 Oct 2020 17:58:12 +0200 Subject: [PATCH 2/6] Update .editorconfig with trim_trailing_whitespace Co-authored-by: Javier Neira --- .editorconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.editorconfig b/.editorconfig index 1dd89173eb..4b1763b4d1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,7 @@ indent_style = tab [*] end_of_line = LF +trim_trailing_whitespace = true [*.{hs,lhs}] indent_style = space From db5942c2ebb5b1021968da019c6ec7cf214594b0 Mon Sep 17 00:00:00 2001 From: Pasqualino 'Titto' Assini Date: Thu, 8 Oct 2020 17:59:00 +0200 Subject: [PATCH 3/6] Update .editorconfig Co-authored-by: Javier Neira --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 4b1763b4d1..653302eaba 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,6 +13,5 @@ trim_trailing_whitespace = true [*.{hs,lhs}] indent_style = space indent_size = 4 -trim_trailing_whitespace = true insert_final_newline = true max_line_length = 80 From 11f74359073278ad0050fe0c6693205fd5bf489f Mon Sep 17 00:00:00 2001 From: Pasqualino 'Titto' Assini Date: Sun, 11 Oct 2020 20:25:05 +0200 Subject: [PATCH 4/6] Update .editorconfig Co-authored-by: Javier Neira --- .editorconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.editorconfig b/.editorconfig index 653302eaba..85852edb21 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,7 @@ indent_style = tab [*] end_of_line = LF trim_trailing_whitespace = true +insert_final_newline = true [*.{hs,lhs}] indent_style = space From 8421af0cfed2683d9865692f1a5fb034e4377bf8 Mon Sep 17 00:00:00 2001 From: Pasqualino 'Titto' Assini Date: Sun, 11 Oct 2020 20:25:17 +0200 Subject: [PATCH 5/6] Update .editorconfig Co-authored-by: Javier Neira --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 85852edb21..86168bd5ef 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,5 +14,4 @@ insert_final_newline = true [*.{hs,lhs}] indent_style = space indent_size = 4 -insert_final_newline = true max_line_length = 80 From 299a0d0e7af191d25edf0f0a313aa5d355aedef7 Mon Sep 17 00:00:00 2001 From: Pasqualino Titto Assini Date: Sun, 11 Oct 2020 20:28:08 +0200 Subject: [PATCH 6/6] removed Makefile section --- .editorconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 86168bd5ef..4b0c4d1d26 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,9 +3,6 @@ root = true -[Makefile] -indent_style = tab - [*] end_of_line = LF trim_trailing_whitespace = true