3 files changed, 144 insertions, 0 deletions
diff --git a/test/files/neg/bug1011.check b/test/files/neg/bug1011.check
new file mode 100644
index 0000000000..7de677639a
--- /dev/null
+++ b/test/files/neg/bug1011.check
@@ -0,0 +1,4 @@
+bug1011.scala:8: error: not found: value entity
+       <dl><code>{Text(entity)}</code>
+                       ^
+one error found
diff --git a/test/files/neg/bug1011.scala b/test/files/neg/bug1011.scala
new file mode 100644
index 0000000000..7dc3f49469
--- /dev/null
+++ b/test/files/neg/bug1011.scala
@@ -0,0 +1,127 @@
+package test;
+import scala.xml._;
+
+abstract class Test {
+  //val entity : String;
+  def primitiveHeader : NodeSeq =
+    Group({
+       <dl><code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code>
+           <code>{Text(entity)}</code></dl>
+    } ++ // 3 seconds
+    {}++ // 5 seconds
+    {}++ // 10 seconds
+    {}++ // 20 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 5 seconds
+    {}++ // 10 seconds
+    {}++ // 20 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 5 seconds
+    {}++ // 10 seconds
+    {}++ // 20 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    {}++ // 40 seconds
+    <hr/>);
+}
diff --git a/test/files/pos/bug1014.scala b/test/files/pos/bug1014.scala
new file mode 100644
index 0000000000..fdabc8b67c
--- /dev/null
+++ b/test/files/pos/bug1014.scala
@@ -0,0 +1,13 @@
+import scala.xml.{NodeSeq, Elem}
+
+class EO extends Application with Moo{
+  def cat = <cat>dog</cat>
+
+  implicit def nodeSeqToFlog(in: Elem): Flog = new Flog(in)
+}
+
+trait Moo {
+  def cat: Flog
+}
+
+class Flog(val in: NodeSeq)