From c2e8da8278534af4c824da9c77f0dd3fde2e1690 Mon Sep 17 00:00:00 2001 From: elbrujohalcon Date: Thu, 24 Oct 2024 14:56:29 +0200 Subject: [PATCH] =?UTF-8?q?elbrujohalcon.otp=5Fformatter.update-=20Allow?= =?UTF-8?q?=20tests=20to=20work=20with=20OTP25=20and=20OTP26=E2=80=A6=20ho?= =?UTF-8?q?pefully?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/erlang.yml | 2 +- test_app/after/src/brackets.erl | 2 +- test_app/after/src/inline_items/inline_items_when_over.erl | 2 +- test_app/after/src/inline_items/inline_items_when_under.erl | 2 +- test_app/after/src/inline_items/inline_no_items.erl | 2 +- test_app/after/src/paper_and_ribbon/indent_18.erl | 6 +++--- test_app/after/src/paper_and_ribbon/indent_81.erl | 6 +++--- test_app/src/brackets.erl | 2 +- test_app/src/paper_and_ribbon/indent_18.erl | 4 ++-- test_app/src/paper_and_ribbon/indent_81.erl | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml index f1f40b9..e4dd9d5 100644 --- a/.github/workflows/erlang.yml +++ b/.github/workflows/erlang.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - otp: ['26'] + otp: ['25', '26'] rebar: ['3.24'] steps: diff --git a/test_app/after/src/brackets.erl b/test_app/after/src/brackets.erl index 895c33d..7c9a386 100644 --- a/test_app/after/src/brackets.erl +++ b/test_app/after/src/brackets.erl @@ -1,6 +1,6 @@ -module(brackets). --format #{paper => 50, inline_items => all}. +-format #{inline_items => all, paper => 50}. -compile(export_all). diff --git a/test_app/after/src/inline_items/inline_items_when_over.erl b/test_app/after/src/inline_items/inline_items_when_over.erl index ba744a1..c77e270 100644 --- a/test_app/after/src/inline_items/inline_items_when_over.erl +++ b/test_app/after/src/inline_items/inline_items_when_over.erl @@ -3,7 +3,7 @@ %% per line if they're larger than 5 elements. -module(inline_items_when_over). --format #{paper => 80, inline_items => {when_over, 5}}. +-format #{inline_items => {when_over, 5}, paper => 80}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/test_app/after/src/inline_items/inline_items_when_under.erl b/test_app/after/src/inline_items/inline_items_when_under.erl index b26e42c..55bc77c 100644 --- a/test_app/after/src/inline_items/inline_items_when_under.erl +++ b/test_app/after/src/inline_items/inline_items_when_under.erl @@ -1,6 +1,6 @@ -module(inline_items_when_under). --format #{paper => 80, inline_items => {when_under, 5}}. +-format #{inline_items => {when_under, 5}, paper => 80}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/test_app/after/src/inline_items/inline_no_items.erl b/test_app/after/src/inline_items/inline_no_items.erl index 86db03c..0ab7b30 100644 --- a/test_app/after/src/inline_items/inline_no_items.erl +++ b/test_app/after/src/inline_items/inline_no_items.erl @@ -3,7 +3,7 @@ %% per line if they're large. -module(inline_no_items). --format #{paper => 80, inline_items => none}. +-format #{inline_items => none, paper => 80}. -export([short_tuple/0, short_list/0, short_fun/0]). -export([short_bin/0, short_guard/1, short_lc/0]). diff --git a/test_app/after/src/paper_and_ribbon/indent_18.erl b/test_app/after/src/paper_and_ribbon/indent_18.erl index dc7f951..c342542 100644 --- a/test_app/after/src/paper_and_ribbon/indent_18.erl +++ b/test_app/after/src/paper_and_ribbon/indent_18.erl @@ -1,9 +1,9 @@ -module(indent_18). --format #{sub_indent => 8, - break_indent => 1, +-format #{break_indent => 1, + inline_clause_bodies => true, paper => 50, - inline_clause_bodies => true}. + sub_indent => 8}. -record(record, {fields = diff --git a/test_app/after/src/paper_and_ribbon/indent_81.erl b/test_app/after/src/paper_and_ribbon/indent_81.erl index b4324a8..4b00c9d 100644 --- a/test_app/after/src/paper_and_ribbon/indent_81.erl +++ b/test_app/after/src/paper_and_ribbon/indent_81.erl @@ -1,8 +1,8 @@ -module(indent_81). --format #{sub_indent => 1, - break_indent => 8, - paper => 50}. +-format #{break_indent => 8, + paper => 50, + sub_indent => 1}. -format #{inline_clause_bodies => true}. -record(record, diff --git a/test_app/src/brackets.erl b/test_app/src/brackets.erl index ff9a912..4d5fbc5 100644 --- a/test_app/src/brackets.erl +++ b/test_app/src/brackets.erl @@ -1,6 +1,6 @@ -module(brackets). --format(#{paper => 50, inline_items => all}). +-format(#{inline_items => all, paper => 50}). -compile(export_all). diff --git a/test_app/src/paper_and_ribbon/indent_18.erl b/test_app/src/paper_and_ribbon/indent_18.erl index fa528a8..3db4754 100644 --- a/test_app/src/paper_and_ribbon/indent_18.erl +++ b/test_app/src/paper_and_ribbon/indent_18.erl @@ -1,9 +1,9 @@ -module(indent_18). -format(#{break_indent => 1, - sub_indent => 8, + inline_clause_bodies => true, paper => 50, - inline_clause_bodies => true}). + sub_indent => 8}). -record( record, {fields = should:be(indented_using:break_indent(1)), diff --git a/test_app/src/paper_and_ribbon/indent_81.erl b/test_app/src/paper_and_ribbon/indent_81.erl index ecf2a63..511595b 100644 --- a/test_app/src/paper_and_ribbon/indent_81.erl +++ b/test_app/src/paper_and_ribbon/indent_81.erl @@ -1,6 +1,6 @@ -module(indent_81). --format(#{break_indent => 8, sub_indent => 1, paper => 50}). +-format(#{break_indent => 8, paper => 50, sub_indent => 1}). -format(#{inline_clause_bodies => true}). -record(