[gnome-builder] ctags: be more careful when determining when we can activate
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] ctags: be more careful when determining when we can activate
- Date: Thu, 3 Nov 2016 04:14:03 +0000 (UTC)
commit 970f06200eeecb10b9be318a0aff1e7343cd41fc
Author: Christian Hergert <chergert redhat com>
Date: Wed Nov 2 21:08:26 2016 -0700
ctags: be more careful when determining when we can activate
This ensures that we are a bit more strict when checking to see if we
can allow the activation of the completion provider.
plugins/ctags/ide-ctags-completion-provider.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/plugins/ctags/ide-ctags-completion-provider.c b/plugins/ctags/ide-ctags-completion-provider.c
index def1051..fb77506 100644
--- a/plugins/ctags/ide-ctags-completion-provider.c
+++ b/plugins/ctags/ide-ctags-completion-provider.c
@@ -284,16 +284,23 @@ ide_ctags_completion_provider_match (GtkSourceCompletionProvider *provider,
if (activation == GTK_SOURCE_COMPLETION_ACTIVATION_INTERACTIVE)
{
- if (gtk_text_iter_starts_line (&iter) ||
- !gtk_text_iter_backward_char (&iter) ||
- g_unichar_isspace (gtk_text_iter_get_char (&iter)))
+ gunichar ch;
+
+ if (gtk_text_iter_starts_line (&iter))
+ return FALSE;
+
+ gtk_text_iter_backward_char (&iter);
+
+ ch = gtk_text_iter_get_char (&iter);
+
+ if (g_unichar_isalnum (ch))
return FALSE;
}
- if (!g_settings_get_boolean (self->settings, "ctags-autocompletion"))
+ if (ide_completion_provider_context_in_comment_or_string (context))
return FALSE;
- if (ide_completion_provider_context_in_comment (context))
+ if (!g_settings_get_boolean (self->settings, "ctags-autocompletion"))
return FALSE;
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]