From 65086faa2261a3f1fcec91a2017fb831dd4031d2 Mon Sep 17 00:00:00 2001
From: Brian Cardarella <bcardarella@gmail.com>
Date: Thu, 23 May 2024 19:43:43 -0400
Subject: [PATCH] Fix for map literal

---
 lib/sourceror.ex | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/sourceror.ex b/lib/sourceror.ex
index a14f77d..b2df75f 100644
--- a/lib/sourceror.ex
+++ b/lib/sourceror.ex
@@ -45,8 +45,11 @@ defmodule Sourceror do
   with pre 1.13 Elixir versions.
   """
   defmacro string_to_quoted!(string, opts) do
-    quote bind_quoted: [code_module: @code_module, string: string, opts: opts] do
+    map_literal_fix? = Version.match?(System.version(), "< 1.17.0")
+
+    quote bind_quoted: [code_module: @code_module, string: string, opts: opts, map_literal_fix?: map_literal_fix?] do
       code_module.string_to_quoted_with_comments!(string, opts)
+      |> Sourceror.map_literal_fix(map_literal_fix?)
     end
   end
 
@@ -55,11 +58,39 @@ defmodule Sourceror do
   with pre 1.13 Elixir versions.
   """
   defmacro string_to_quoted(string, opts) do
-    quote bind_quoted: [code_module: @code_module, string: string, opts: opts] do
+    map_literal_fix? = Version.match?(System.version(), "< 1.17.0")
+
+    quote bind_quoted: [code_module: @code_module, string: string, opts: opts, map_literal_fix?: map_literal_fix?] do
       code_module.string_to_quoted_with_comments(string, opts)
+      |> Sourceror.map_literal_fix(map_literal_fix?)
     end
   end
 
+  @doc false
+  def map_literal_fix(result, false),
+    do: result
+
+  def map_literal_fix({:error, reason}, _),
+    do: {:error, reason}
+
+  def map_literal_fix({:ok, quoted, comments}, true) do
+    {quoted, comments} = map_literal_fix({quoted, comments}, true)
+    {:ok, quoted, comments}
+  end
+
+  def map_literal_fix({quoted, comments}, true) do
+    quoted = Macro.postwalk(quoted, fn
+      {:%{}, meta, args} ->
+        column = meta[:column]
+        meta = Keyword.replace(meta, :column, column - 1)
+
+        {:%{}, meta, args}
+      quoted -> quoted
+    end)
+
+    {quoted, comments}
+  end
+
   @doc """
   A wrapper around `Code.quoted_to_algebra/2` for compatibility with pre 1.13
   Elixir versions.