From a9676f77f1b4542b10d6e3b87040fca5d5d65de2 Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Tue, 12 Jun 2012 18:50:39 +0200
Subject: [PATCH] again a decorator fix, which is important for nested
 decorators

---
 evaluate.py                | 11 +++++++----
 test/completion/classes.py |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/evaluate.py b/evaluate.py
index a42326f7..ba6e5b5e 100644
--- a/evaluate.py
+++ b/evaluate.py
@@ -283,8 +283,9 @@ class Function(object):
                 debug.dbg('decorator:', dec, f)
                 dec_results = follow_statement(dec)
                 if not len(dec_results):
-                    debug.warning('decorator func not found', self.base_func)
-                    return []
+                    debug.warning('decorator func not found: %s in stmt %s' % 
+                                                        (self.base_func, dec))
+                    return None
                 if len(dec_results) > 1:
                     debug.warning('multiple decorators found', self.base_func,
                                                             dec_results)
@@ -296,7 +297,7 @@ class Function(object):
                 wrappers = Execution(decorator, params).get_return_types()
                 if not len(wrappers):
                     debug.warning('no wrappers found', self.base_func)
-                    return []
+                    return None
                 if len(wrappers) > 1:
                     debug.warning('multiple wrappers found', self.base_func,
                                                                 wrappers)
@@ -1065,9 +1066,11 @@ def follow_path(path, scope, position=None):
             # curly braces are not allowed, because they make no sense
             debug.warning('strange function call with {}', current, scope)
     else:
-        if isinstance(scope, Function):
+        # the function must not be decorated with something else
+        if isinstance(scope, Function) and isinstance(scope.func, Function):
             # TODO check default function methods and return them
             result = []
+            print 'la'
         else:
             # TODO check magic class methods and return them also
             # this is the typical lookup while chaining things
diff --git a/test/completion/classes.py b/test/completion/classes.py
index f9ec5ead..6fb53c65 100644
--- a/test/completion/classes.py
+++ b/test/completion/classes.py
@@ -183,9 +183,9 @@ class B():
     def r(self):
         return 1
 
-    #@r.setter
-    #def r(self, value):
-    #    pass
+    @r.setter
+    def r(self, value):
+        pass
 
 #? []
 B().r.