[anjuta] language-support-cpp-java: bgo#615596 - . -> completions doesn't work with prefixed &, %, etc
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] language-support-cpp-java: bgo#615596 - . -> completions doesn't work with prefixed &, %, etc
- Date: Sun, 18 Apr 2010 20:26:07 +0000 (UTC)
commit d5ece0a0f5482afd94191640db3487870b9dc6a6
Author: Johannes Schmid <jhs gnome org>
Date: Sun Apr 18 22:25:46 2010 +0200
language-support-cpp-java: bgo#615596 - . -> completions doesn't work with prefixed &, %, etc
Also refactored the code a bit to use a lookup-table.
.../language-support-cpp-java/cpp-java-assist.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/plugins/language-support-cpp-java/cpp-java-assist.c b/plugins/language-support-cpp-java/cpp-java-assist.c
index 4b5c190..7dc6b4a 100644
--- a/plugins/language-support-cpp-java/cpp-java-assist.c
+++ b/plugins/language-support-cpp-java/cpp-java-assist.c
@@ -309,6 +309,12 @@ cpp_java_assist_is_expression_separator (gchar c, gboolean skip_braces, IAnjutaI
{
IAnjutaEditorAttribute attrib = ianjuta_editor_cell_get_attribute (IANJUTA_EDITOR_CELL(iter),
NULL);
+ int i;
+ const gchar separators[] = {',', ';', '\n', '\r', '\t', '(',
+ '{', '}', '=', '<', '\v', '!',
+ '&', '%', '*', '[', ']', '?', '/',
+ '+', 0};
+
if (attrib == IANJUTA_EDITOR_STRING ||
attrib == IANJUTA_EDITOR_COMMENT)
{
@@ -323,10 +329,10 @@ cpp_java_assist_is_expression_separator (gchar c, gboolean skip_braces, IAnjutaI
else if (c == ')' && !skip_braces)
return FALSE;
- if (c == ',' || c == ';' || c == '\n' || c == '\r' || c == '\t' || c == '(' ||
- c == '{' || c == '}' || c == '=' || c == '<' || c == '\v' || c == '!')
+ for (i = 0; separators[i] != 0; i++)
{
- return TRUE;
+ if (separators[i] == c)
+ return TRUE;
}
return FALSE;
@@ -349,7 +355,7 @@ cpp_java_assist_parse_expression (CppJavaAssist* assist, IAnjutaIterable* iter,
gboolean op_start = FALSE;
gboolean ref_start = FALSE;
gchar* stmt = NULL;
-
+
/* Cursor points after the current characters, move back */
ianjuta_iterable_previous (cur_pos, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]