[anjuta] language-support-cpp-java: #566982 - don't autocomplete inside string or comment

[Johannes Schmid <jhs src gnome org>]

commit ba5751b8c16dbdf3722c9900fce28c7f98b200e1
Author: Johannes Schmid <jhs gnome org>
Date:   Sun Jan 10 14:47:53 2010 +0100

    language-support-cpp-java: #566982 -  don't autocomplete inside string or comment

 .../language-support-cpp-java/cpp-java-assist.c    |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index e60a442..ee1bcec 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -711,14 +711,6 @@ on_editor_char_added (IAnjutaEditor *editor, IAnjutaIterable *insert_pos,
 	cpp_java_assist_calltip(assist, enable_calltips, (ch == '\b'));
 }
 
-static gboolean
-is_word_or_operator(gchar c)
-{
-	if (is_word_character (c) || c == '.' || c == '-' || c == '>')
-		return TRUE;
-	return FALSE;
-}
-
 /* FIXME: find a better tester */
 static gboolean
 is_expression_separator (gchar c)
@@ -854,6 +846,14 @@ cpp_java_parse_expression (CppJavaAssist* assist, IAnjutaIterable* iter, IAnjuta
 	return res;
 }
 
+static gboolean
+cpp_java_assist_valid_iter (CppJavaAssist* assist, IAnjutaIterable* iter)
+{
+	IAnjutaEditorCell* cell = IANJUTA_EDITOR_CELL (iter);
+	IAnjutaEditorAttribute attribute = ianjuta_editor_cell_get_attribute (cell, NULL);
+	return (attribute != IANJUTA_EDITOR_STRING && attribute != IANJUTA_EDITOR_COMMENT);
+}
+
 static void
 cpp_java_assist_populate (IAnjutaProvider* self, IAnjutaIterable* iter, GError** e)
 {
@@ -868,8 +868,8 @@ cpp_java_assist_populate (IAnjutaProvider* self, IAnjutaIterable* iter, GError**
 	assist->priv->pre_word = NULL;
 
 	ianjuta_iterable_previous (iter, NULL);
-	
-	if (autocomplete)
+
+	if (autocomplete && cpp_java_assist_valid_iter (assist, iter))
 	{
 		/* Check for member completion */
 		IAnjutaIterable* start_iter = NULL;