Merge pull request #2734 from gjaldon/clearer-unquote-splicing-error

Friendlier unquote_splicing error with hints

Author: José Valim

lib/elixir/src/elixir_quote.erl

@@ -151,6 +151,10 @@ escape(Expr, Unquote) ->
 
 %% Quotes an expression and return its quoted Elixir AST.
 
+quote({unquote_splicing, _, [_]}, Binding, #elixir_quote{unquote=true}, E) ->
+  argument_error(<<"unquote_splicing only works inside arguments and block contexts, "
+    "wrap it in parens if you want it to work with one-liners">>);
+
 quote(Expr, nil, Q, E) ->
   do_quote(Expr, Q, E);
 

lib/elixir/test/elixir/kernel/errors_test.exs

@@ -290,6 +290,23 @@ defmodule Kernel.ErrorsTest do
       'unquote 1'
   end
 
+  test :invalid_unquote_splicing_in_oneliners do
+    assert_compile_fail ArgumentError,
+      "unquote_splicing only works inside arguments and block contexts, " <>
+      "wrap it in parens if you want it to work with one-liners",
+      '''
+      defmodule Foo do
+        defmacro oneliner2 do
+          quote do: unquote_splicing 1
+        end
+
+        def callme do
+          oneliner2
+        end
+      end
+      '''
+  end
+
   test :invalid_quote_args do
     assert_compile_fail CompileError,
       "nofile:1: invalid arguments for quote",