Fix merge conflicts

bryanjos · bryanjos · commit 2a4b9a1deb4a · 2017-09-09T03:38:38.000-05:00
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -335,7 +335,7 @@ defmodule ElixirScript.Translate.Form do
     {ast, state}
   end
 
-  def compile({{:., _, [{_, _, atom} = var, func_or_prop]}, _, []}, state) when is_atom(atom) do
+  def compile({{:., _, [var, func_or_prop]}, _, []}, state) when not is_atom(var) do
     ast = Helpers.call(
       ElixirScript.Translate.Forms.JS.call_property(),
       [compile!(var, state), J.literal(to_string(func_or_prop))]
diff --git a/test/integration/integration_test.exs b/test/integration/integration_test.exs
@@ -24,4 +24,9 @@ defmodule ElixirScript.Integration.Test do
     val = call_compiled_function Integration, :map_equals, []
     assert val == true
   end
+
+  test "multi-remote call" do
+    val = call_compiled_function Integration, :multi_field_call, []
+    assert val == "5,000,000"
+  end
 end
diff --git a/test/passes/translate/form_test.exs b/test/passes/translate/form_test.exs
@@ -2,6 +2,7 @@ defmodule ElixirScript.Translate.Forms.Test do
   use ExUnit.Case
   alias ElixirScript.Translate.Form
   alias ElixirScript.Translate.Identifier
+  alias ElixirScript.Translate.Helpers
   alias ESTree.Tools.Builder, as: J
   require StreamData
   import PropertyTest
@@ -146,4 +147,25 @@ defmodule ElixirScript.Translate.Forms.Test do
       J.literal(3)
     ])
   end
+
+  test "calling field on field" do
+    ast = {{:., [line: 16],
+    [{{:., [line: 16], [{:map, [line: 16], nil}, :token_count]}, [line: 16],
+      []}, :toLocaleString]}, [line: 16], []}
+
+    state = %{function: {:something, nil}, vars: %{}}
+
+    {js_ast, _} = Form.compile(ast, state)
+
+    assert js_ast == Helpers.call(
+      ElixirScript.Translate.Forms.JS.call_property(),
+      [
+        Helpers.call(
+          ElixirScript.Translate.Forms.JS.call_property(),
+          [J.identifier("map"), J.literal("token_count")]
+        ),
+        J.literal("toLocaleString")
+      ]
+    )
+  end
 end
diff --git a/test/support/integration.ex b/test/support/integration.ex
@@ -16,4 +16,9 @@ defmodule Integration do
     map2 = %{test: "map"}
     map1 == map2
   end
+
+  def multi_field_call do
+    map = %{token_count: 5000000}
+    map.token_count.toLocaleString()
+  end
 end
