SF.net SVN: geany: [1844] trunk

[ntrel at users.sourceforge.net]

Revision: 1844
          http://geany.svn.sourceforge.net/geany/?rev=1844&view=rev
Author:   ntrel
Date:     2007-08-30 08:11:33 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Prevent calltip after typing '(' when in a comment or string.
Allow forced autocompletion in a comment or string.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-30 14:24:26 UTC (rev 1843)
+++ trunk/ChangeLog	2007-08-30 15:11:33 UTC (rev 1844)
@@ -13,6 +13,9 @@
    Only focus the current document after switching pages if the open
    files treeview currently has focus (otherwise focus commands can be
    overridden, e.g. when pressing F4 during opening several files).
+ * src/editor.c:
+   Prevent calltip after typing '(' when in a comment or string.
+   Allow forced autocompletion in a comment or string.
 
 
 2007-08-29  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2007-08-30 14:24:26 UTC (rev 1843)
+++ trunk/src/editor.c	2007-08-30 15:11:33 UTC (rev 1844)
@@ -863,7 +863,7 @@
 		if (pos == -1) return FALSE;
 	}
 
-	style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
+	style = SSM(sci, SCI_GETSTYLEAT, pos - 1, 0);	// the style 1 before the brace (which may be highlighted)
 	if (is_comment(lexer, style))
 		return FALSE;
 
@@ -975,7 +975,7 @@
 	style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
 
 	 // don't autocomplete in comments and strings
-	 if (is_comment(lexer, style))
+	 if (!force && is_comment(lexer, style))
 		return FALSE;
 
 	linebuf = sci_get_line(sci, line);


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