wip

Author: doorgan

lib/elixir/lib/code.ex

@@ -1035,9 +1035,7 @@ defmodule Code do
     to_quoted_opts =
       [
         unescape: false,
-        literal_encoder: &{:ok, {:__block__, &2, [&1]}},
         include_comments: true,
-        token_metadata: true,
         emit_warnings: false
       ] ++ opts
 
@@ -1291,22 +1289,21 @@ defmodule Code do
 
     Process.put(:code_formatter_comments, [])
 
-    opts = 
+    opts =
       if include_comments do
-        [preserve_comments: &preserve_comments/5,
+        [
+          preserve_comments: &preserve_comments/5,
           literal_encoder: &{:ok, {:__block__, &2, [&1]}},
-      token_metadata: true,
-      unescape: false,
-      columns: true,
-] ++ opts
+          token_metadata: true,
+          unescape: false
+        ] ++ opts
       else
         opts
       end
 
     quoted = :elixir.string_to_quoted!(to_charlist(string), line, column, file, opts)
 
     if include_comments do
-      # quoted = Code.Normalizer.normalize(quoted)
       Code.Comments.merge_comments(quoted, Process.get(:code_formatter_comments))
     else
       quoted
@@ -1425,7 +1422,7 @@ defmodule Code do
   defp next_eol_count([?\r, ?\n | rest], count), do: next_eol_count(rest, count + 1)
   defp next_eol_count(_, count), do: count
 
-  defp previous_eol_count([{token, {_, _, count}} | _])
+  defp previous_eol_count([{token, {_, _, count}} | _] )
        when token in [:eol, :",", :";"] and count > 0 do
     count
   end
@@ -1492,8 +1489,17 @@ defmodule Code do
   @doc since: "1.13.0"
   @spec quoted_to_algebra(Macro.t(), keyword) :: Inspect.Algebra.t()
   def quoted_to_algebra(quoted, opts \\ []) do
+    comments = opts[:comments]
+
     quoted
     |> Code.Normalizer.normalize(opts)
+    |> then(fn quoted ->
+      if comments do
+        Code.Comments.merge_comments(quoted, comments)
+      else
+        quoted
+      end
+    end)
     |> Code.Formatter.to_algebra(opts)
   end