PythonCodeCompletion: Improved completion hint formatting by unwrapping wrapped text and using the objects type and name as the heading. Improved calltip formatting by separating default args from the call spec (easier for the plugin to parse).

spillz · spillz · commit 5a9b6f7bad2c · 2015-01-24T17:51:59.000-05:00
diff --git a/PythonCodeCompletion/PythonCodeCompletion.cpp b/PythonCodeCompletion/PythonCodeCompletion.cpp
@@ -381,7 +381,7 @@ std::vector<PythonCodeCompletion::CCCallTip> PythonCodeCompletion::GetCallTips(i
         Manager::Get()->GetLogManager()->DebugLog(_("PYCC: Supplying the calltip ")+m_ActiveCalltipDef.tip);
         PythonCodeCompletion::CCCallTip ct=m_ActiveCalltipDef;
         m_ActiveCalltipDef=PythonCodeCompletion::CCCallTip(_T(""));
-        wxString s = ct.tip;
+        wxString s = ct.tip.BeforeFirst(_T('\n'));
         if(s==_(""))
         {
             return cts;
diff --git a/PythonCodeCompletion/python/python_completion_server.py b/PythonCodeCompletion/python/python_completion_server.py
@@ -114,11 +114,11 @@ def get_doc(self,index):
             doclines = comp.follow_definition()[0].raw_doc.splitlines()
         else:
             doclines = comp.doc.splitlines()
+        doclines = [l.strip() for l in doclines]
         if len(doclines)>0:
-            doclines[0] = '<b>'+doclines[0]+'</b>'
-        else:
-            doclines =['<b>'+comp.type+' '+comp.name+'</b>']
-        doc = '<br>'.join(doclines)
+            doclines = ['<br><br>']+[l + ' ' if l!='' else '<br><br>' for l in doclines[:-1]] + [doclines[-1]]
+        doclines =['<b>'+comp.type+' '+comp.name+'</b>'] + doclines
+        doc = ''.join(doclines)
         return doc
 
     def complete_tip(self,path,source,line,column):
@@ -131,15 +131,18 @@ def complete_tip(self,path,source,line,column):
             calltip=c.call_name+'('
             if jedi.__version__ >= '0.8.0':
                 calltip+=', '.join([p.name for p in c.params])+')'
+                default_args=[]
+                for p in c.params:
+                    if '=' in p.description:
+                        default_args.append(p.description)
+                if default_args:
+                    calltip = calltip + '\n\nDefault Arguments: ' + ', '.join(default_args)
+#                if c.doc:
+#                    calltip = calltip + '\n\nDescription\n' + c.doc
             else:
                 calltip+=', '.join([p.get_name().names[0] for p in c.params])+')'
-            calltip = '\n'.join(textwrap.wrap(calltip,70))
-            calltip = '\n'.join(textwrap.wrap(calltip,70))
-#            docstr=''
-#            for p in c.params:
-#                docstr+=p.docstr
-#            if docstr!='':
-#                calltip+='\n'+docstr
+#            calltip = '\n'.join(textwrap.wrap(calltip,70))
+
             return calltip
         return ''
 

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ std::vector<PythonCodeCompletion::CCCallTip> PythonCodeCompletion::GetCallTips(i`
`381`	`381`	`Manager::Get()->GetLogManager()->DebugLog(_("PYCC: Supplying the calltip ")+m_ActiveCalltipDef.tip);`
`382`	`382`	`PythonCodeCompletion::CCCallTip ct=m_ActiveCalltipDef;`
`383`	`383`	`m_ActiveCalltipDef=PythonCodeCompletion::CCCallTip(_T(""));`
`384`		`- wxString s = ct.tip;`
	`384`	`+ wxString s = ct.tip.BeforeFirst(_T('\n'));`
`385`	`385`	`if(s==_(""))`
`386`	`386`	`{`
`387`	`387`	`return cts;`