From f6e95876b8a0c4f270e600779e7f04689023a848 Mon Sep 17 00:00:00 2001
From: sunli <scott_s829@163.com>
Date: Mon, 27 Apr 2020 14:14:29 +0800
Subject: [PATCH] Fix some bugs

---
 async-graphql-derive/src/object.rs        |  9 +++++++++
 async-graphql-derive/src/simple_object.rs | 16 ++++++++--------
 async-graphql-derive/src/subscription.rs  |  9 ++++++++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/async-graphql-derive/src/object.rs b/async-graphql-derive/src/object.rs
index 701b126b..b49ed381 100644
--- a/async-graphql-derive/src/object.rs
+++ b/async-graphql-derive/src/object.rs
@@ -363,6 +363,15 @@ pub fn generate(object_args: &args::Object, item_impl: &mut ItemImpl) -> Result<
                     }
                 });
 
+                if let Some((idx, _)) = method
+                    .attrs
+                    .iter()
+                    .enumerate()
+                    .find(|(_, a)| a.path.is_ident("field"))
+                {
+                    method.attrs.remove(idx);
+                }
+            } else {
                 if let Some((idx, _)) = method
                     .attrs
                     .iter()
diff --git a/async-graphql-derive/src/simple_object.rs b/async-graphql-derive/src/simple_object.rs
index 08d0c376..798b385f 100644
--- a/async-graphql-derive/src/simple_object.rs
+++ b/async-graphql-derive/src/simple_object.rs
@@ -113,15 +113,15 @@ pub fn generate(object_args: &args::Object, input: &mut DeriveInput) -> Result<T
                         return #crate_name::OutputValueType::resolve(&self.#ident, &ctx_obj, ctx.position).await;
                     }
                 });
+            }
 
-                if let Some((idx, _)) = item
-                    .attrs
-                    .iter()
-                    .enumerate()
-                    .find(|(_, a)| a.path.is_ident("field"))
-                {
-                    item.attrs.remove(idx);
-                }
+            if let Some((idx, _)) = item
+                .attrs
+                .iter()
+                .enumerate()
+                .find(|(_, a)| a.path.is_ident("field"))
+            {
+                item.attrs.remove(idx);
             }
         }
     }
diff --git a/async-graphql-derive/src/subscription.rs b/async-graphql-derive/src/subscription.rs
index 0161148e..b98bd05e 100644
--- a/async-graphql-derive/src/subscription.rs
+++ b/async-graphql-derive/src/subscription.rs
@@ -254,8 +254,15 @@ pub fn generate(object_args: &args::Object, item_impl: &mut ItemImpl) -> Result<
                         return Ok(Box::pin(stream));
                     }
                 });
+            }
 
-                method.attrs.clear();
+            if let Some((idx, _)) = method
+                .attrs
+                .iter()
+                .enumerate()
+                .find(|(_, a)| a.path.is_ident("field"))
+            {
+                method.attrs.remove(idx);
             }
         }
     }