Display calltips for Pascal symbols in the Pascal way (#2803945).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3852 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2009-06-10  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/editor.c:
+   Display calltips for Pascal symbols in the Pascal way (#2803945).
+
+
 2009-06-10  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/editor.c, tagmanager/include/tm_workspace.h,

src/editor.c

@@ -1442,27 +1442,42 @@ static gboolean append_calltip(GString *str, const TMTag *tag, filetype_id ft_id
 	if (! tag->atts.entry.arglist)
 		return FALSE;
 
-	if (tag->atts.entry.var_type)
-	{
-		guint i;
+	if (ft_id != GEANY_FILETYPES_PASCAL)
+	{	/* usual calltips: "retval tagname (arglist)" */
+		if (tag->atts.entry.var_type)
+		{
+			guint i;
 
-		g_string_append(str, tag->atts.entry.var_type);
-		for (i = 0; i < tag->atts.entry.pointerOrder; i++)
+			g_string_append(str, tag->atts.entry.var_type);
+			for (i = 0; i < tag->atts.entry.pointerOrder; i++)
+			{
+				g_string_append_c(str, '*');
+			}
+			g_string_append_c(str, ' ');
+		}
+		if (tag->atts.entry.scope)
 		{
-			g_string_append_c(str, '*');
+			const gchar *cosep = symbols_get_context_separator(ft_id);
+
+			g_string_append(str, tag->atts.entry.scope);
+			g_string_append(str, cosep);
 		}
+		g_string_append(str, tag->name);
 		g_string_append_c(str, ' ');
+		g_string_append(str, tag->atts.entry.arglist);
 	}
-	if (tag->atts.entry.scope)
-	{
-		const gchar *cosep = symbols_get_context_separator(ft_id);
+	else
+	{	/* special case Pascal calltips: "tagname (arglist) : retval" */
+		g_string_append(str, tag->name);
+		g_string_append_c(str, ' ');
+		g_string_append(str, tag->atts.entry.arglist);
 
-		g_string_append(str, tag->atts.entry.scope);
-		g_string_append(str, cosep);
+		if (NZV(tag->atts.entry.var_type))
+		{
+			g_string_append(str, " : ");
+			g_string_append(str, tag->atts.entry.var_type);
+		}
 	}
-	g_string_append(str, tag->name);
-	g_string_append_c(str, ' ');
-	g_string_append(str, tag->atts.entry.arglist);
 
 	return TRUE;
 }