Respect line property when file is given, closes #13542

Author: josevalim

lib/elixir/src/elixir_expand.erl

@@ -188,7 +188,7 @@ expand({quote, Meta, [Opts, Do]}, S, E) when is_list(Do) ->
 
   {File, Line} = case lists:keyfind(location, 1, EOpts) of
     {location, keep} ->
-      {?key(E, file), false};
+      {?key(E, file), true};
     false ->
       {proplists:get_value(file, EOpts, nil), proplists:get_value(line, EOpts, false)}
   end,

lib/elixir/src/elixir_quote.erl

@@ -529,13 +529,17 @@ generated(Meta, #elixir_quote{generated=false}) -> Meta.
 
 keep(Meta, #elixir_quote{file=nil, line=Line}) ->
   line(Meta, Line);
-keep(Meta, #elixir_quote{file=File}) ->
+keep(Meta, #elixir_quote{file=File, line=true}) ->
   case lists:keytake(line, 1, Meta) of
     {value, {line, Line}, MetaNoLine} ->
       [{keep, {File, Line}} | MetaNoLine];
     false ->
       [{keep, {File, 0}} | Meta]
-  end.
+  end;
+keep(Meta, #elixir_quote{file=File, line=false}) ->
+  [{keep, {File, 0}} | keydelete(line, Meta)];
+keep(Meta, #elixir_quote{file=File, line=Line}) ->
+  [{keep, {File, Line}} | keydelete(line, Meta)].
 
 line(Meta, true) ->
   Meta;

lib/elixir/test/elixir/kernel/quote_test.exs

@@ -30,6 +30,17 @@ defmodule Kernel.QuoteTest do
     assert quote(line: true, do: bar(1, 2, 3)) == {:bar, [line: __ENV__.line], [1, 2, 3]}
   end
 
+  test "file line" do
+    assert quote(file: "foo", line: 3, do: bar(1, 2, 3)) ==
+             {:bar, [keep: {"foo", 3}], [1, 2, 3]}
+
+    assert quote(file: "foo", line: false, do: bar(1, 2, 3)) ==
+             {:bar, [keep: {"foo", 0}], [1, 2, 3]}
+
+    assert quote(file: "foo", line: true, do: bar(1, 2, 3)) ==
+             {:bar, [keep: {"foo", __ENV__.line - 1}], [1, 2, 3]}
+  end
+
   test "quote line var" do
     line = __ENV__.line
     assert quote(line: line, do: bar(1, 2, 3)) == {:bar, [line: line], [1, 2, 3]}

lib/elixir/test/elixir/kernel/warning_test.exs

@@ -62,7 +62,7 @@ defmodule Kernel.WarningTest do
   end
 
   defmacro will_warn do
-    quote file: "demo" do
+    quote file: "demo", line: true do
       %{dup: 1, dup: 2}
     end
   end