From 266a12e70626d1d6119308c884c79f930bdd5bec Mon Sep 17 00:00:00 2001
From: Roland Karlsson <roland.karlsson@erlang-solutions.com>
Date: Mon, 21 Apr 2014 13:46:18 +0200
Subject: Add test case to syntax_tools

The added test case tests a bug when reverting maps in syntax tools.
---
 lib/syntax_tools/test/syntax_tools_SUITE.erl | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index d4c54a72aa..6fb3e5ccfb 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -24,12 +24,12 @@
 	 init_per_group/2,end_per_group/2]).
 
 %% Test cases
--export([app_test/1,appup_test/1,smoke_test/1,revert/1]).
+-export([app_test/1,appup_test/1,smoke_test/1,revert/1,revert_map/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_test,appup_test,smoke_test,revert].
+    [app_test,appup_test,smoke_test,revert,revert_map].
 
 groups() -> 
     [].
@@ -109,6 +109,16 @@ revert_file(File, Path) ->
             ok
     end.
 
+%% Testing bug fix for reverting map_field_assoc
+revert_map(Config) ->
+    Dog = ?t:timetrap(?t:minutes(1)),
+    ?line [{map_field_assoc,16,{atom,17,name},{var,18,'Value'}}] =
+        erl_syntax:revert_forms([{tree,map_field_assoc,
+                                  {attr,16,[],none},
+                                  {map_field_assoc,
+                                   {atom,17,name},{var,18,'Value'}}}]),
+    ?line ?t:timetrap_cancel(Dog).
+
 p_run(Test, List) ->
     N = erlang:system_info(schedulers),
     p_run_loop(Test, List, N, [], 0).
-- 
cgit v1.2.3


From c8695cd2b0fcd95f0af5c67bf049d19dbba5ec82 Mon Sep 17 00:00:00 2001
From: Roland Karlsson <roland.karlsson@erlang-solutions.com>
Date: Mon, 21 Apr 2014 13:50:32 +0200
Subject: Fix reverting map in syntax_tools

There was a copy-paste bug in erl_syntax when running
e.g. erl_syntax:revert_forms, affecting maps. Instead of getting
Key/Value you got Key/Key in the resulting abstract form.
---
 lib/syntax_tools/src/erl_syntax.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index c9996c954e..46a5ca48df 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -2071,7 +2071,7 @@ map_field_assoc_value(Node) ->
         {map_field_assoc, _, _, Value} ->
             Value;
         _ ->
-            (data(Node))#map_field_assoc.name
+            (data(Node))#map_field_assoc.value
     end.
 
 
@@ -2129,7 +2129,7 @@ map_field_exact_value(Node) ->
         {map_field_exact, _, _, Value} ->
             Value;
         _ ->
-            (data(Node))#map_field_exact.name
+            (data(Node))#map_field_exact.value
     end.
 
 
-- 
cgit v1.2.3