[gnome-builder/wip/chergert/completion] completion: use new completion API



commit c7b5a55dd970fb91df0877db104690859cb2fe4a
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jun 4 01:42:21 2018 -0700

    completion: use new completion API

 src/libide/editor/ide-editor-view.c      | 9 +++++----
 src/plugins/retab/gbp-retab-view-addin.c | 8 ++++----
 src/tests/test-ide-indenter.c            | 6 +++---
 src/tests/test-vim.c                     | 6 +++---
 4 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/src/libide/editor/ide-editor-view.c b/src/libide/editor/ide-editor-view.c
index 32498fdc6..ad396e011 100644
--- a/src/libide/editor/ide-editor-view.c
+++ b/src/libide/editor/ide-editor-view.c
@@ -25,6 +25,7 @@
 #include <pango/pangofc-fontmap.h>
 
 #include "buffers/ide-buffer-private.h"
+#include "completion/ide-completion.h"
 #include "editor/ide-editor-private.h"
 #include "sourceview/ide-line-change-gutter-renderer.h"
 #include "util/ide-gtk.h"
@@ -506,20 +507,20 @@ search_revealer_notify_reveal_child (IdeEditorView *self,
                                      GParamSpec    *pspec,
                                      GtkRevealer   *revealer)
 {
-  GtkSourceCompletion *completion;
+  IdeCompletion *completion;
 
   g_return_if_fail (IDE_IS_EDITOR_VIEW (self));
   g_return_if_fail (pspec != NULL);
   g_return_if_fail (GTK_IS_REVEALER (revealer));
 
-  completion = gtk_source_view_get_completion (GTK_SOURCE_VIEW (self->source_view));
+  completion = ide_source_view_get_completion (IDE_SOURCE_VIEW (self->source_view));
 
   if (!gtk_revealer_get_reveal_child (revealer))
     {
       ide_editor_search_end_interactive (self->search);
 
       /* Restore completion that we blocked below. */
-      gtk_source_completion_unblock_interactive (completion);
+      ide_completion_unblock_interactive (completion);
     }
   else
     {
@@ -530,7 +531,7 @@ search_revealer_notify_reveal_child (IdeEditorView *self,
        * slows things down like search/replace functionality. We'll
        * restore it above when we clear state.
        */
-      gtk_source_completion_block_interactive (completion);
+      ide_completion_block_interactive (completion);
     }
 }
 
diff --git a/src/plugins/retab/gbp-retab-view-addin.c b/src/plugins/retab/gbp-retab-view-addin.c
index fb1565c26..05a68c8de 100644
--- a/src/plugins/retab/gbp-retab-view-addin.c
+++ b/src/plugins/retab/gbp-retab-view-addin.c
@@ -118,7 +118,7 @@ gbp_retab_view_addin_action (GSimpleAction *action,
   GbpRetabViewAddin *self = user_data;
   IdeSourceView *source_view;
   GtkTextBuffer *buffer;
-  GtkSourceCompletion *completion;
+  IdeCompletion *completion;
   guint tab_width;
   gint start_line;
   gint end_line;
@@ -137,7 +137,7 @@ gbp_retab_view_addin_action (GSimpleAction *action,
   g_assert (IDE_IS_SOURCE_VIEW (source_view));
 
   editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (source_view));
-  completion = gtk_source_view_get_completion (GTK_SOURCE_VIEW (source_view));
+  completion = ide_source_view_get_completion (IDE_SOURCE_VIEW (source_view));
   tab_width = gtk_source_view_get_tab_width(GTK_SOURCE_VIEW (source_view));
   to_spaces = gtk_source_view_get_insert_spaces_instead_of_tabs(GTK_SOURCE_VIEW (source_view));
 
@@ -153,7 +153,7 @@ gbp_retab_view_addin_action (GSimpleAction *action,
   start_line = gtk_text_iter_get_line (&begin);
   end_line = gtk_text_iter_get_line (&end);
 
-  gtk_source_completion_block_interactive (completion);
+  ide_completion_block_interactive (completion);
   gtk_text_buffer_begin_user_action (buffer);
 
   for (gint line = start_line; line <= end_line; ++line)
@@ -164,7 +164,7 @@ gbp_retab_view_addin_action (GSimpleAction *action,
     }
 
   gtk_text_buffer_end_user_action (buffer);
-  gtk_source_completion_unblock_interactive (completion);
+  ide_completion_unblock_interactive (completion);
 }
 
 static const GActionEntry actions[] = {
diff --git a/src/tests/test-ide-indenter.c b/src/tests/test-ide-indenter.c
index 41ea3aa3d..963c0e953 100644
--- a/src/tests/test-ide-indenter.c
+++ b/src/tests/test-ide-indenter.c
@@ -45,7 +45,7 @@ new_context_cb (GObject      *object,
   g_autoptr(GTask) task = user_data;
   g_autoptr(IdeContext) context = NULL;
   g_autoptr(GError) error = NULL;
-  GtkSourceCompletion *completion;
+  IdeCompletion *completion;
   GtkWidget *window;
   GtkWidget *widget;
 
@@ -72,8 +72,8 @@ new_context_cb (GObject      *object,
                              NULL);
       gtk_container_add (GTK_CONTAINER (window), widget);
 
-      completion = gtk_source_view_get_completion (GTK_SOURCE_VIEW (widget));
-      gtk_source_completion_block_interactive (completion);
+      completion = ide_source_view_get_completion (IDE_SOURCE_VIEW (widget));
+      ide_completion_block_interactive (completion);
 
       gtk_window_present (GTK_WINDOW (window));
 
diff --git a/src/tests/test-vim.c b/src/tests/test-vim.c
index bd5b4f112..90fa602f3 100644
--- a/src/tests/test-vim.c
+++ b/src/tests/test-vim.c
@@ -47,7 +47,7 @@ new_context_cb (GObject      *object,
   GtkWidget *window;
   GtkWidget *widget;
   IdeBuffer *buffer;
-  GtkSourceCompletion *completion;
+  IdeCompletion *completion;
   IdeContext *context;
 
   context = ide_context_new_finish (result, &error);
@@ -72,8 +72,8 @@ new_context_cb (GObject      *object,
                              NULL);
       gtk_container_add (GTK_CONTAINER (window), widget);
 
-      completion = gtk_source_view_get_completion (GTK_SOURCE_VIEW (widget));
-      gtk_source_completion_block_interactive (completion);
+      completion = ide_source_view_get_completion (IDE_SOURCE_VIEW (widget));
+      ide_completion_block_interactive (completion);
 
       gtk_window_present (GTK_WINDOW (window));
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]