elbrujohalcon.otp_formatter.update- Allow tests to work with OTP25 an…

…d OTP26… hopefully
AdRoll · Oct 24, 2024 · c2e8da8 · c2e8da8
1 parent 80dd875
commit c2e8da8
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(