Changeset 1187:d913cc7d0d8f

Timestamp:

06/18/08 09:47:45 (6 months ago)

Author:

Ali Afshar <aafshar@…>

Message:

Python plugin: Added support for decorators, classmethods and staticmethods

Location:

pida-plugins/python

Files:

• python.py (modified) (1 diff)
• ropebrowser.py (modified) (7 diffs)

pida-plugins/python/python.py

@@ -172 +172 @@
                 #Column('ctype_markup', use_markup=True),
                 #Column('nodename_markup', use_markup=True),
+                Column('type_markup', use_markup=True),
                 Column('rendered', use_markup=True, expand=True),
                 Column('sort_hack', visible=False),

pida-plugins/python/ropebrowser.py

@@ -38 +38 @@
     return markup_grey_italic(s)
 
+def markup_fixed(text):
+    return '<tt>%s</tt>' % text
+
 def markup_name(name):
-    return markup_bold(name)
+    return markup_bold(markup_fixed(name))
 
 class TreeOptions(object):
@@ -54 +57 @@
         return ''
 
+    def get_pre_markup(self):
+        return ''
+
 
 class FunctionOptions(TreeOptions):
@@ -61 +67 @@
     position = 2
 
+    def get_pre_markup(self):
+        decs = ', '.join(['@' + d.id for d in
+            self.item.object.decorators])
+        if decs:
+            decs = decs + '\n'
+        return markup_fixed(markup_italic(decs))
+
+
     def get_extra_markup(self):
-        return markup_bold_bracketted(
+        attrs = markup_bold_bracketted(
             ', '.join(self.item.object.get_param_names())
         )
+        return attrs
+
+
+class EvaluatedOptions(TreeOptions):
+
+    type_name = 'p'
+    type_color = '#900090'
 
 
@@ -76 +97 @@
     type_name = '(m)'
     position = 6
+
+class ClassMethodOptions(MethodOptions):
+
+    type_name = 'cm'
+    position = 3
+
+class StaticMethodOptions(MethodOptions):
+
+    type_name = 'sm'
+    position = 4
 
 
@@ -117 +148 @@
     elif isinstance(item.node, pynames.DefinedName):
         if isinstance(item.object, pyobjects.PyFunction):
-            if item.object.get_kind() == 'method':
+            kind = item.object.get_kind()
+            if kind == 'method':
                 if item.name in item.parent.object.get_scope().get_defined_names():
                     return MethodOptions(item)
                 else:
                     return SuperMethodOptions(item)
+            elif kind == 'classmethod':
+                return ClassMethodOptions(item)
+            elif kind == 'staticmethod':
+                return StaticMethodOptions(item)
             else:
+                print item.object.get_kind(), item.name
                 return FunctionOptions(item)
         else:
@@ -130 +167 @@
     elif isinstance(item.node, builtins.BuiltinName):
         return BuiltinOptions(item)
+    elif isinstance(item.node, pynames.EvaluatedName):
+        return EvaluatedOptions(item)
     else:
-        print 'boo', item, item.node
+        print 'boo', item, item.node, item.name, item.object
 
 
@@ -164 +203 @@
         self.rendered = self.render()
 
+        self.type_markup = markup_type(self.options.type_name,
+                                       self.options.type_color)
+
     def render(self):
-        return '%s %s%s %s' % (
-            markup_type(self.options.type_name,
-                         self.options.type_color),
+        return '%s%s%s %s' % (
+            self.options.get_pre_markup(),
             markup_name(self.name),
             self.options.get_extra_markup(),