SF.net SVN: geany:[5123] trunk

[ntrel at users.sourceforge.net]

Revision: 5123
          http://geany.svn.sourceforge.net/geany/?rev=5123&view=rev
Author:   ntrel
Date:     2010-08-10 16:12:24 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
Revert r4840 scope completion mode as it sometimes breaks
autocompletion.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-10 12:49:16 UTC (rev 5122)
+++ trunk/ChangeLog	2010-08-10 16:12:24 UTC (rev 5123)
@@ -11,6 +11,9 @@
    prefs, even if it was overridden when it was originally read.
  * src/keyfile.c, src/ui_utils.c, doc/geany.txt, doc/geany.html:
    Move some interface hidden prefs to ui_utils.c.
+ * src/editor.c:
+   Revert r4840 scope completion mode as it sometimes breaks
+   autocompletion.
 
 
 2010-08-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2010-08-10 12:49:16 UTC (rev 5122)
+++ trunk/src/editor.c	2010-08-10 16:12:24 UTC (rev 5123)
@@ -95,14 +95,6 @@
 	ScintillaObject *sci;
 } calltip = {NULL, FALSE, NULL, 0, 0, NULL};
 
-static enum
-{
-	AUTOC_CANCELLED,
-	AUTOC_SCOPE,
-	AUTOC_TAGS,
-	AUTOC_DOC_WORDS
-} autocompletion_mode = AUTOC_CANCELLED;
-
 static gchar indent[100];
 
 
@@ -603,10 +595,7 @@
 		tags = tm_workspace_find_scope_members(obj ? obj->tags_array : NULL,
 			name, TRUE, FALSE);
 		if (tags)
-		{
-			autocompletion_mode = AUTOC_SCOPE;
 			show_tags_list(editor, tags, 0);
-		}
 	}
 }
 
@@ -958,7 +947,6 @@
 		case SCN_AUTOCCANCELLED:
 			/* now that autocomplete is finishing or was cancelled, reshow calltips
 			 * if they were showing */
-			autocompletion_mode = AUTOC_CANCELLED;
 			request_reshowing_calltip(nt);
 			break;
 
@@ -1807,7 +1795,6 @@
 	tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang);
 	if (tags)
 	{
-		autocompletion_mode = AUTOC_TAGS;
 		show_tags_list(editor, tags, rootlen);
 		return tags->len > 0;
 	}
@@ -1946,7 +1933,6 @@
 	g_slist_free(list);
 	g_string_free(words, TRUE);
 
-	autocompletion_mode = AUTOC_DOC_WORDS;
 	show_autocomplete(sci, rootlen, str->str);
 	g_string_free(str, TRUE);
 	return TRUE;
@@ -2006,7 +1992,7 @@
 	root = linebuf + startword;
 	rootlen = current - startword;
 
-	if (rootlen > 0 && autocompletion_mode != AUTOC_SCOPE)
+	if (rootlen > 0)
 	{
 		if (autocomplete_check_for_html(ft->id, style))
 		{


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