From 983e10550c002a55ee7149fe0d811e765c1a6e39 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 2 Nov 2015 14:51:00 +0900
Subject: [PATCH 1/2] remove duplicate keywords

---
 .../scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
index c93e76669..00112a77c 100644
--- a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
+++ b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
@@ -20,7 +20,7 @@ trait DescriptorPimps {
     "return", "sealed", "super", "this", "throw",
     "trait", "try", "true", "type", "val",
     "var", "while", "with", "yield",
-    "val", "var", "def", "if", "ne", "case", "scala")
+    "ne", "scala")
 
   implicit class AsSymbolPimp(val s: String) {
     def asSymbol: String = if (SCALA_RESERVED_WORDS.contains(s)) s"`$s`" else s

From 19a337df0f662962e82e1bf5d167b791a66fbf2d Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 2 Nov 2015 14:51:29 +0900
Subject: [PATCH 2/2] "macro" is a reserved word since Scala 2.11

---
 .../scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
index 00112a77c..7c0fb4425 100644
--- a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
+++ b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
@@ -15,7 +15,7 @@ trait DescriptorPimps {
     "abstract", "case", "catch", "class", "def",
     "do", "else", "extends", "false", "final",
     "finally", "for", "forSome", "if", "implicit",
-    "import", "lazy", "match", "new", "null",
+    "import", "lazy", "macro", "match", "new", "null",
     "object", "override", "package", "private", "protected",
     "return", "sealed", "super", "this", "throw",
     "trait", "try", "true", "type", "val",