SF.net SVN: geany: [1448] trunk

[ntrel at users.sourceforge.net]

Revision: 1448
          http://svn.sourceforge.net/geany/?rev=1448&view=rev
Author:   ntrel
Date:     2007-04-15 04:46:25 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Prevent D module tag lookup for D constructor calltips.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/sci_cb.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-04-13 16:51:48 UTC (rev 1447)
+++ trunk/ChangeLog	2007-04-15 11:46:25 UTC (rev 1448)
@@ -1,3 +1,9 @@
+2007-04-15  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/sci_cb.c:
+   Prevent D module tag lookup for D constructor calltips.
+
+
 2007-04-13  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * src/sci_cb.c: Fixed missing calltip display when using a space after

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2007-04-13 16:51:48 UTC (rev 1447)
+++ trunk/src/sci_cb.c	2007-04-15 11:46:25 UTC (rev 1448)
@@ -697,6 +697,8 @@
 static gchar *find_calltip(const gchar *word, filetype *ft)
 {
 	const GPtrArray *tags;
+	const gint arg_types = tm_tag_function_t | tm_tag_prototype_t |
+		tm_tag_method_t | tm_tag_macro_with_arg_t;
 	TMTagAttrType *attrs = NULL;
 	TMTag *tag;
 	GString *str = NULL;
@@ -704,7 +706,7 @@
 
 	g_return_val_if_fail(ft && word && *word, NULL);
 
-	tags = tm_workspace_find(word, tm_tag_max_t, attrs, FALSE, ft->lang);
+	tags = tm_workspace_find(word, arg_types | tm_tag_class_t, attrs, FALSE, ft->lang);
 	if (tags->len == 0)
 		return NULL;
 
@@ -714,7 +716,7 @@
 	{
 		// user typed e.g. 'new Classname(' so lookup D constructor Classname::this()
 		tags = tm_workspace_find_scoped("this", tag->name,
-			tm_tag_function_t | tm_tag_prototype_t, attrs, FALSE, ft->lang, TRUE);
+			arg_types, attrs, FALSE, ft->lang, TRUE);
 		if (tags->len == 0)
 			return NULL;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.