Bump Elixir to 1.13 (#55)

Author: angelikatyborska

.github/workflows/smoke_test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     container:
-      image: hexpm/elixir:1.12.1-erlang-24.0.1-ubuntu-focal-20210325
+      image: hexpm/elixir:1.13.0-erlang-24.1.7-ubuntu-focal-20210325
 
     steps:
       - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579

.tool-versions

@@ -1,2 +1,2 @@
-elixir 1.12.1-otp-24
-erlang 24.0.1
+elixir 1.13.0-otp-24
+erlang 24.1.7

Dockerfile

@@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.12.1-erlang-24.0.1-ubuntu-focal-20210325 as builder
+FROM hexpm/elixir:1.13.0-erlang-24.1.7-ubuntu-focal-20210325 as builder
 
 # Install SSL ca certificates
 RUN apt-get update && \
@@ -14,7 +14,7 @@ COPY . .
 # Builds an escript bin/elixir_representer
 RUN ./bin/build.sh
 
-FROM hexpm/elixir:1.12.1-erlang-24.0.1-ubuntu-focal-20210325
+FROM hexpm/elixir:1.13.0-erlang-24.1.7-ubuntu-focal-20210325
 COPY --from=builder /etc/passwd /etc/passwd
 COPY --from=builder /elixir-representer/bin /opt/representer/bin
 RUN apt-get update && \

lib/representer.ex

@@ -9,7 +9,13 @@ defmodule Representer do
       |> File.read!()
       |> represent
 
-    File.write!(code_output, Macro.to_string(represented_ast) <> "\n")
+    formatted_represented_string =
+      represented_ast
+      |> Macro.to_string()
+      |> Code.format_string!(line_length: 120, force_do_end_blocks: true)
+      |> IO.iodata_to_binary()
+
+    File.write!(code_output, formatted_represented_string <> "\n")
     File.write!(mapping_output, to_string(mapping))
   end
 

mix.exs

@@ -5,7 +5,7 @@ defmodule Representer.MixProject do
     [
       app: :representer,
       version: "0.1.0",
-      elixir: "~> 1.12",
+      elixir: "~> 1.13",
       start_permanent: Mix.env() == :prod,
       deps: deps(),
       escript: escript()

test/representer_test.exs

@@ -29,6 +29,7 @@ defmodule RepresenterTest do
     test "parentheses_in_pipes" do
       test_directory("parentheses_in_pipes")
     end
+
     test "modules" do
       test_directory("modules")
     end

test_data/local_function_calls/expected_representation.txt

@@ -1,26 +1,33 @@
-defmodule(Placeholder_1) do
-  def(placeholder_2(placeholder_3)) do
+defmodule Placeholder_1 do
+  def placeholder_2(placeholder_3) do
     "Hello, #{placeholder_3}"
   end
-  def(placeholder_2()) do
+
+  def placeholder_2() do
     placeholder_2("Alice")
   end
-  def(placeholder_4(placeholder_5)) do
+
+  def placeholder_4(placeholder_5) do
     placeholder_6(placeholder_5, [])
   end
-  defp(placeholder_6([], placeholder_7)) do
+
+  defp placeholder_6([], placeholder_7) do
     placeholder_7
   end
-  defp(placeholder_6([placeholder_8 | placeholder_9], placeholder_7)) do
+
+  defp placeholder_6([placeholder_8 | placeholder_9], placeholder_7) do
     placeholder_6(placeholder_9, [placeholder_8 | placeholder_7])
   end
-  def(placeholder_10(placeholder_5)) do
+
+  def placeholder_10(placeholder_5) do
     Enum.reverse(placeholder_5)
   end
-  def(placeholder_11()) do
+
+  def placeholder_11() do
     Placeholder_1.placeholder_2()
   end
-  def(placeholder_12(placeholder_3)) do
+
+  def placeholder_12(placeholder_3) do
     __MODULE__.placeholder_2(placeholder_3)
   end
 end

test_data/macros_and_guards/expected_representation.txt

@@ -1,25 +1,32 @@
-defmodule(Placeholder_1) do
-  def(placeholder_2(placeholder_3)) do
+defmodule Placeholder_1 do
+  def placeholder_2(placeholder_3) do
     placeholder_3.first_name
   end
-  defp(placeholder_4(placeholder_3)) do
+
+  defp placeholder_4(placeholder_3) do
     true
   end
-  defmacro(placeholder_5) do
+
+  defmacro placeholder_5 do
     true
   end
-  defmacrop(placeholder_6) do
+
+  defmacrop placeholder_6 do
     true
   end
-  defguard(placeholder_7(placeholder_8) when is_integer(placeholder_8) and rem(placeholder_8, 2) == 0)
-  defguardp(placeholder_9(placeholder_8) when is_integer(placeholder_8) and rem(placeholder_8, 2) == 1)
-  def(placeholder_10(placeholder_8) when placeholder_7(placeholder_8)) do
+
+  defguard placeholder_7(placeholder_8) when is_integer(placeholder_8) and rem(placeholder_8, 2) == 0
+  defguardp placeholder_9(placeholder_8) when is_integer(placeholder_8) and rem(placeholder_8, 2) == 1
+
+  def placeholder_10(placeholder_8) when placeholder_7(placeholder_8) do
     true
   end
-  def(placeholder_10(placeholder_8)) do
+
+  def placeholder_10(placeholder_8) do
     false
   end
-  def(placeholder_11(placeholder_8)) do
+
+  def placeholder_11(placeholder_8) do
     placeholder_9(placeholder_8)
   end
 end

test_data/modules/expected_representation.txt

@@ -1,38 +1,42 @@
-(
-  defmodule(Placeholder_1) do
-    alias(Placeholder_1, as: Placeholder_2)
-    def(placeholder_3) do
-      Placeholder_1.placeholder_4()
-      Placeholder_2.placeholder_4()
-    end
-    def(placeholder_4) do
-      :ok
-    end
+defmodule Placeholder_1 do
+  alias Placeholder_1, as: Placeholder_2
+
+  def placeholder_3 do
+    Placeholder_1.placeholder_4()
+    Placeholder_2.placeholder_4()
+  end
+
+  def placeholder_4 do
+    :ok
+  end
+end
+
+defmodule Placeholder_5.Placeholder_6.Placeholder_7 do
+  alias Placeholder_5.Placeholder_6, as: Placeholder_8
+
+  def placeholder_9 do
+    Placeholder_1.placeholder_3()
+    Placeholder_2.placeholder_3()
+    Placeholder_5.Placeholder_6.Placeholder_7.placeholder_9()
+    Placeholder_8.Placeholder_7.placeholder_9()
+    __MODULE__.placeholder_9()
+    External.external()
+    Placeholder_1.External.external()
+    Placeholder_5.External.Placeholder_7.nine()
   end
-  defmodule(Placeholder_5.Placeholder_6.Placeholder_7) do
-    alias(Placeholder_5.Placeholder_6, as: Placeholder_8)
-    def(placeholder_9) do
-      Placeholder_1.placeholder_3()
-      Placeholder_2.placeholder_3()
-      Placeholder_5.Placeholder_6.Placeholder_7.placeholder_9()
-      Placeholder_8.Placeholder_7.placeholder_9()
-      __MODULE__.placeholder_9()
+
+  defmodule Placeholder_10 do
+  end
+
+  defmodule Placeholder_11 do
+    alias Placeholder_5.Placeholder_6.Placeholder_7.{Placeholder_10, Placeholder_11}
+    alias Placeholder_8.Placeholder_7.Placeholder_11, as: Placeholder_12
+    alias Placeholder_8.Placeholder_7, as: Placeholder_2
+    alias External, as: Placeholder_13
+
+    def placeholder_14 do
       External.external()
-      Placeholder_1.External.external()
-      Placeholder_5.External.Placeholder_7.nine()
-    end
-    defmodule(Placeholder_10) do
-      
-    end
-    defmodule(Placeholder_11) do
-      alias(Placeholder_5.Placeholder_6.Placeholder_7.{Placeholder_10, Placeholder_11})
-      alias(Placeholder_8.Placeholder_7.Placeholder_11, as: Placeholder_12)
-      alias(Placeholder_8.Placeholder_7, as: Placeholder_2)
-      alias(External, as: Placeholder_13)
-      def(placeholder_14) do
-        External.external()
-        Placeholder_13.external()
-      end
+      Placeholder_13.external()
     end
   end
-)
+end

test_data/parentheses_in_pipes/expected_representation.txt

@@ -1,14 +1,17 @@
-defmodule(Placeholder_1) do
-  def(placeholder_2(placeholder_3, placeholder_4, placeholder_5)) do
+defmodule Placeholder_1 do
+  def placeholder_2(placeholder_3, placeholder_4, placeholder_5) do
     placeholder_3 |> placeholder_4() |> placeholder_5()
   end
-  def(placeholder_6(placeholder_3, placeholder_4, placeholder_5)) do
+
+  def placeholder_6(placeholder_3, placeholder_4, placeholder_5) do
     placeholder_3 |> placeholder_4() |> placeholder_5()
   end
-  def(placeholder_7(placeholder_3, placeholder_4, placeholder_5)) do
+
+  def placeholder_7(placeholder_3, placeholder_4, placeholder_5) do
     placeholder_3 |> placeholder_4() |> placeholder_5()
   end
-  def(placeholder_8(placeholder_3, placeholder_4, placeholder_5)) do
+
+  def placeholder_8(placeholder_3, placeholder_4, placeholder_5) do
     placeholder_3 |> placeholder_4() |> placeholder_5()
   end
 end