fix tests emitting invalid AST

Author: lukaszsamson

apps/language_server/test/support/plugins/ecto/query.ex

@@ -7,7 +7,9 @@ defmodule Ecto.Query do
   Creates a query.
   """
   defmacro from(expr, kw \\ []) do
-    {expr, kw}
+    quote do
+      {unquote(expr), unquote(kw)}
+    end
   end
 
   @doc """
@@ -40,7 +42,9 @@ defmodule Ecto.Query do
 
   """
   defmacro select(query, binding \\ [], expr) do
-    {query, binding, expr}
+    quote do
+      {unquote(query), unquote(binding), unquote(expr)}
+    end
   end
 
   @doc """
@@ -76,7 +80,9 @@ defmodule Ecto.Query do
   it will default to the source, `p` in the example above.
   """
   defmacro select_merge(query, binding \\ [], expr) do
-    {query, binding, expr}
+    quote do
+      {unquote(query), unquote(binding), unquote(expr)}
+    end
   end
 
   @doc """
@@ -112,6 +118,8 @@ defmodule Ecto.Query do
 
   """
   defmacro distinct(query, binding \\ [], expr) do
-    {query, binding, expr}
+    quote do
+      {unquote(query), unquote(binding), unquote(expr)}
+    end
   end
 end

apps/language_server/test/support/plugins/ecto/schema.ex

@@ -7,26 +7,38 @@ defmodule Ecto.Schema do
   Defines a field on the schema with given name and type.
   """
   defmacro field(name, type \\ :string, opts \\ []) do
-    {name, type, opts}
+    quote do
+      {unquote(name), unquote(type), unquote(opts)}
+    end
   end
 
   defmacro schema(source, do: block) do
-    {source, block}
+    quote do
+      {unquote(source), unquote(block)}
+    end
   end
 
   defmacro has_many(name, queryable, opts \\ []) do
-    {name, queryable, opts}
+    quote do
+      {unquote(name), unquote(queryable), unquote(opts)}
+    end
   end
 
   defmacro has_one(name, queryable, opts \\ []) do
-    {name, queryable, opts}
+    quote do
+      {unquote(name), unquote(queryable), unquote(opts)}
+    end
   end
 
   defmacro belongs_to(name, queryable, opts \\ []) do
-    {name, queryable, opts}
+    quote do
+      {unquote(name), unquote(queryable), unquote(opts)}
+    end
   end
 
   defmacro many_to_many(name, queryable, opts \\ []) do
-    {name, queryable, opts}
+    quote do
+      {unquote(name), unquote(queryable), unquote(opts)}
+    end
   end
 end