Revert auto-formatted code.

ShPakvel · Dec 12, 2024 · b8730cc · b8730cc
1 parent 7fd09e2
commit b8730cc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 117 deletions.
diff --git a/integration_test/test/code_generation/app_with_defaults_test.exs b/integration_test/test/code_generation/app_with_defaults_test.exs
@@ -60,10 +60,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithDefaultsTest do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog")
 
-        mix_run!(
-          ~w(phx.gen.html Blog Post posts title:unique body:string status:enum:unpublished:published:deleted order:integer:unique),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.html Blog Post posts title:unique body:string status:enum:unpublished:published:deleted order:integer:unique), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/phx_blog_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -120,10 +117,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithDefaultsTest do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog")
 
-        mix_run!(
-          ~w(phx.gen.json Blog Post posts title:unique body:string status:enum:unpublished:published:deleted),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.json Blog Post posts title:unique body:string status:enum:unpublished:published:deleted), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/phx_blog_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -184,10 +178,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithDefaultsTest do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--live"])
 
-        mix_run!(
-          ~w(phx.gen.live Blog Post posts title body:string public:boolean status:enum:unpublished:published:deleted),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.live Blog Post posts title body:string public:boolean status:enum:unpublished:published:deleted), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/phx_blog_web/router.ex"), fn file ->
           inject_before_final_end(file, """

diff --git a/integration_test/test/code_generation/app_with_mssql_adapter_test.exs b/integration_test/test/code_generation/app_with_mssql_adapter_test.exs
@@ -8,10 +8,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
         {app_root_path, _} =
           generate_phoenix_app(tmp_dir, "default_mssql_app", ["--database", "mssql"])
 
-        mix_run!(
-          ~w(phx.gen.html Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.html Blog Post posts title body:string status:enum:unpublished:published:deleted), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/default_mssql_app_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -37,10 +34,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
         {app_root_path, _} =
           generate_phoenix_app(tmp_dir, "default_mssql_app", ["--database", "mssql"])
 
-        mix_run!(
-          ~w(phx.gen.json Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.json Blog Post posts title body:string status:enum:unpublished:published:deleted), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/default_mssql_app_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -66,10 +60,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
         {app_root_path, _} =
           generate_phoenix_app(tmp_dir, "default_mssql_app", ["--database", "mssql", "--live"])
 
-        mix_run!(
-          ~w(phx.gen.live Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.live Blog Post posts title body:string status:enum:unpublished:published:deleted), app_root_path)
 
         modify_file(Path.join(app_root_path, "lib/default_mssql_app_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -94,8 +85,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
   describe "phx.gen.auth + pbkdf2 + existing context" do
     test "has no compilation or formatter warnings (--live)" do
       with_installer_tmp("new with defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
 
         mix_run!(
           ~w(phx.gen.html Accounts Group groups
@@ -117,10 +107,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
           """)
         end)
 
-        mix_run!(
-          ~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --live),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --live), app_root_path)
 
         assert_no_compilation_warnings(app_root_path)
         assert_passes_formatter_check(app_root_path)
@@ -129,8 +116,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
 
     test "has no compilation or formatter warnings (--no-live)" do
       with_installer_tmp("new with defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
 
         mix_run!(~w(phx.gen.html Accounts Group groups name), app_root_path)
 
@@ -145,10 +131,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
           """)
         end)
 
-        mix_run!(
-          ~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --no-live),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --no-live), app_root_path)
 
         assert_no_compilation_warnings(app_root_path)
         assert_passes_formatter_check(app_root_path)
@@ -158,8 +141,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
     @tag database: :mssql
     test "has a passing test suite" do
       with_installer_tmp("app_with_defaults (--live)", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mssql", "--live"])
 
         mix_run!(~w(phx.gen.html Accounts Group groups name), app_root_path)
 
@@ -174,10 +156,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMSSQLAdapterTest do
           """)
         end)
 
-        mix_run!(
-          ~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --live),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib pbkdf2 --merge-with-existing-context --live), app_root_path)
 
         drop_test_database(app_root_path)
         assert_tests_pass(app_root_path)

diff --git a/integration_test/test/code_generation/app_with_mysql_adapter_test.exs b/integration_test/test/code_generation/app_with_mysql_adapter_test.exs
@@ -124,8 +124,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMySqlAdapterTest do
   describe "phx.gen.auth + argon2" do
     test "has no compilation or formatter warnings (--live)" do
       with_installer_tmp("new with defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mysql", "--binary-id"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mysql", "--binary-id"])
 
         mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib argon2 --live), app_root_path)
 
@@ -136,13 +135,9 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMySqlAdapterTest do
 
     test "has no compilation or formatter warnings (--no-live)" do
       with_installer_tmp("new with defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mysql", "--binary-id"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "phx_blog", ["--database", "mysql", "--binary-id"])
 
-        mix_run!(
-          ~w(phx.gen.auth Accounts User users --hashing-lib argon2 --no-live),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib argon2 --no-live), app_root_path)
 
         assert_no_compilation_warnings(app_root_path)
         assert_passes_formatter_check(app_root_path)
@@ -152,8 +147,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMySqlAdapterTest do
     @tag database: :mysql
     test "has a passing test suite (--live)" do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "default_app", ["--database", "mysql", "--binary-id"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "default_app", ["--database", "mysql", "--binary-id"])
 
         mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib argon2 --live), app_root_path)
 
@@ -165,13 +159,9 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithMySqlAdapterTest do
     @tag database: :mysql
     test "has a passing test suite (--no-live)" do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "default_app", ["--database", "mysql", "--binary-id"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "default_app", ["--database", "mysql", "--binary-id"])
 
-        mix_run!(
-          ~w(phx.gen.auth Accounts User users --hashing-lib argon2 --no-live),
-          app_root_path
-        )
+        mix_run!(~w(phx.gen.auth Accounts User users --hashing-lib argon2 --no-live), app_root_path)
 
         drop_test_database(app_root_path)
         assert_tests_pass(app_root_path)

diff --git a/integration_test/test/code_generation/app_with_sqlite3_adapter.exs b/integration_test/test/code_generation/app_with_sqlite3_adapter.exs
@@ -144,8 +144,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithSQLite3AdapterTest do
     @tag database: :sqlite3
     test "has a passing test suite (--live)" do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "default_app", ["--database", "sqlite3"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "default_app", ["--database", "sqlite3"])
 
         mix_run!(~w(phx.gen.auth Accounts User users --live), app_root_path)
 
@@ -156,8 +155,7 @@ defmodule Phoenix.Integration.CodeGeneration.AppWithSQLite3AdapterTest do
 
     test "has a passing test suite (--no-live)" do
       with_installer_tmp("app_with_defaults", fn tmp_dir ->
-        {app_root_path, _} =
-          generate_phoenix_app(tmp_dir, "default_app", ["--database", "sqlite3"])
+        {app_root_path, _} = generate_phoenix_app(tmp_dir, "default_app", ["--database", "sqlite3"])
 
         mix_run!(~w(phx.gen.auth Accounts User users --no-live), app_root_path)
 

diff --git a/integration_test/test/code_generation/umbrella_app_with_defaults_test.exs b/integration_test/test/code_generation/umbrella_app_with_defaults_test.exs
@@ -63,10 +63,7 @@ defmodule Phoenix.Integration.CodeGeneration.UmbrellaAppWithDefaultsTest do
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "rainy_day", ["--umbrella"])
         web_root_path = Path.join(app_root_path, "apps/rainy_day_web")
 
-        mix_run!(
-          ~w(phx.gen.html Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          web_root_path
-        )
+        mix_run!(~w(phx.gen.html Blog Post posts title body:string status:enum:unpublished:published:deleted), web_root_path)
 
         modify_file(Path.join(web_root_path, "lib/rainy_day_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -125,10 +122,7 @@ defmodule Phoenix.Integration.CodeGeneration.UmbrellaAppWithDefaultsTest do
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "rainy_day", ["--umbrella"])
         web_root_path = Path.join(app_root_path, "apps/rainy_day_web")
 
-        mix_run!(
-          ~w(phx.gen.json Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          web_root_path
-        )
+        mix_run!(~w(phx.gen.json Blog Post posts title body:string status:enum:unpublished:published:deleted), web_root_path)
 
         modify_file(Path.join(web_root_path, "lib/rainy_day_web/router.ex"), fn file ->
           inject_before_final_end(file, """
@@ -190,10 +184,7 @@ defmodule Phoenix.Integration.CodeGeneration.UmbrellaAppWithDefaultsTest do
         {app_root_path, _} = generate_phoenix_app(tmp_dir, "rainy_day", ["--umbrella", "--live"])
         web_root_path = Path.join(app_root_path, "apps/rainy_day_web")
 
-        mix_run!(
-          ~w(phx.gen.live Blog Post posts title body:string status:enum:unpublished:published:deleted),
-          web_root_path
-        )
+        mix_run!(~w(phx.gen.live Blog Post posts title body:string status:enum:unpublished:published:deleted), web_root_path)
 
         modify_file(Path.join(web_root_path, "lib/rainy_day_web/router.ex"), fn file ->
           inject_before_final_end(file, """

diff --git a/lib/mix/tasks/phx.gen.embedded.ex b/lib/mix/tasks/phx.gen.embedded.ex
@@ -26,7 +26,7 @@ defmodule Mix.Tasks.Phx.Gen.Embedded do
 
   The following types are supported:
 
-  #{for attr <- Mix.Phoenix.Schema.valid_types(), do: "  * `#{inspect(attr)}`\n"}
+  #{for attr <- Mix.Phoenix.Schema.valid_types(), do: " * `#{inspect attr}`\n"}
     * `:datetime` - An alias for `:naive_datetime`
 
   ## Format
@@ -43,9 +43,7 @@ defmodule Mix.Tasks.Phx.Gen.Embedded do
   @doc false
   def run(args) do
     if Mix.Project.umbrella?() do
-      Mix.raise(
-        "mix phx.gen.embedded must be invoked from within your *_web application root directory"
-      )
+      Mix.raise "mix phx.gen.embedded must be invoked from within your *_web application root directory"
     end
 
     schema = build(args)
@@ -79,29 +77,28 @@ defmodule Mix.Tasks.Phx.Gen.Embedded do
     if Schema.valid?(schema) do
       args
     else
-      raise_with_help(
-        "Expected the schema argument, #{inspect(schema)}, to be a valid module name"
-      )
+      raise_with_help "Expected the schema argument, #{inspect schema}, to be a valid module name"
     end
   end
 
   def validate_args!(_) do
-    raise_with_help("Invalid arguments")
+    raise_with_help "Invalid arguments"
   end
 
   @doc false
-  @spec raise_with_help(String.t()) :: no_return()
+  @spec raise_with_help(String.t) :: no_return()
   def raise_with_help(msg) do
-    Mix.raise("""
+    Mix.raise """
     #{msg}
 
     mix phx.gen.embedded expects a module name followed by
     any number of attributes:
 
         mix phx.gen.embedded Blog.Post title:string
-    """)
+    """
   end
 
+
   defp prompt_for_conflicts(schema) do
     schema
     |> files_to_be_generated()