[gnome-builder] code-index: code style cleanup

[Christian Hergert <chergert src gnome org>]

commit 8c1d3d0a41a0f3ce69e2aa15e4b63366ac393753
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 16 20:19:59 2018 -0800

    code-index: code style cleanup

 .../code-index/ide-code-index-search-provider.c    | 69 ++++++++++++++--------
 .../code-index/ide-code-index-search-provider.h    |  3 +-
 2 files changed, 44 insertions(+), 28 deletions(-)
---
diff --git a/src/plugins/code-index/ide-code-index-search-provider.c 
b/src/plugins/code-index/ide-code-index-search-provider.c
index ea5505188..42759a6dd 100644
--- a/src/plugins/code-index/ide-code-index-search-provider.c
+++ b/src/plugins/code-index/ide-code-index-search-provider.c
@@ -22,23 +22,10 @@
 #include "ide-code-index-service.h"
 #include "ide-code-index-index.h"
 
-struct _IdeCodeIndexSearchProvider
-{
-  IdeObject parent;
-};
-
-static void search_provider_iface_init (IdeSearchProviderInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (IdeCodeIndexSearchProvider,
-                         ide_code_index_search_provider,
-                         IDE_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (IDE_TYPE_SEARCH_PROVIDER,
-                                                search_provider_iface_init))
-
 static void
-populate_cb (GObject           *object,
-             GAsyncResult      *result,
-             gpointer           user_data)
+populate_cb (GObject      *object,
+             GAsyncResult *result,
+             gpointer      user_data)
 {
   IdeCodeIndexIndex *index = (IdeCodeIndexIndex *)object;
   g_autoptr(GTask) task = user_data;
@@ -46,12 +33,15 @@ populate_cb (GObject           *object,
   g_autoptr(GError) error = NULL;
 
   g_assert (IDE_IS_CODE_INDEX_INDEX (index));
+  g_assert (G_IS_ASYNC_RESULT (result));
   g_assert (G_IS_TASK (task));
 
   results = ide_code_index_index_populate_finish (index, result, &error);
 
   if (results != NULL)
-    g_task_return_pointer (task, g_steal_pointer (&results), (GDestroyNotify)g_ptr_array_unref);
+    g_task_return_pointer (task,
+                           g_steal_pointer (&results),
+                           (GDestroyNotify)g_ptr_array_unref);
   else
     g_task_return_error (task, g_steal_pointer (&error));
 }
@@ -65,32 +55,52 @@ ide_code_index_search_provider_search_async (IdeSearchProvider   *provider,
                                              gpointer             user_data)
 {
   IdeCodeIndexSearchProvider *self = (IdeCodeIndexSearchProvider *)provider;
+  g_autoptr(GTask) task = NULL;
   IdeCodeIndexService *service;
   IdeCodeIndexIndex *index;
-  g_autoptr(GTask) task = NULL;
+  IdeContext *context;
 
+  IDE_ENTRY;
+
+  g_return_if_fail (IDE_IS_MAIN_THREAD ());
   g_return_if_fail (IDE_IS_CODE_INDEX_SEARCH_PROVIDER (self));
+  g_return_if_fail (search_terms != NULL);
+  g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
 
-  service = ide_context_get_service_typed (ide_object_get_context (IDE_OBJECT (self)),
-                                           IDE_TYPE_CODE_INDEX_SERVICE);
+  context = ide_object_get_context (IDE_OBJECT (self));
+  service = ide_context_get_service_typed (context, IDE_TYPE_CODE_INDEX_SERVICE);
   index = ide_code_index_service_get_index (service);
 
   task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_source_tag (task, ide_code_index_search_provider_search_async);
+  g_task_set_priority (task, G_PRIORITY_LOW);
+
+  ide_code_index_index_populate_async (index,
+                                       search_terms,
+                                       max_results,
+                                       cancellable,
+                                       populate_cb,
+                                       g_steal_pointer (&task));
 
-  ide_code_index_index_populate_async (index, search_terms, max_results, cancellable,
-                                       populate_cb, g_steal_pointer (&task));
+  IDE_EXIT;
 }
 
-static GPtrArray*
+static GPtrArray *
 ide_code_index_search_provider_search_finish (IdeSearchProvider *provider,
                                               GAsyncResult      *result,
                                               GError           **error)
 {
-  GTask *task = (GTask *)result;
+  GPtrArray *ar;
+
+  IDE_ENTRY;
 
-  g_return_val_if_fail (G_IS_TASK(task), NULL);
+  g_return_val_if_fail (IDE_IS_MAIN_THREAD (), NULL);
+  g_return_val_if_fail (IDE_IS_CODE_INDEX_SEARCH_PROVIDER (provider), NULL);
+  g_return_val_if_fail (G_IS_TASK (result), NULL);
 
-  return g_task_propagate_pointer (task, error);
+  ar = g_task_propagate_pointer (G_TASK (result), error);
+
+  IDE_RETURN (ar);
 }
 
 static void
@@ -100,6 +110,13 @@ search_provider_iface_init (IdeSearchProviderInterface *iface)
   iface->search_finish = ide_code_index_search_provider_search_finish;
 }
 
+struct _IdeCodeIndexSearchProvider { IdeObject parent; };
+
+G_DEFINE_TYPE_WITH_CODE (IdeCodeIndexSearchProvider,
+                         ide_code_index_search_provider,
+                         IDE_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (IDE_TYPE_SEARCH_PROVIDER, search_provider_iface_init))
+
 static void
 ide_code_index_search_provider_init (IdeCodeIndexSearchProvider *self)
 {
diff --git a/src/plugins/code-index/ide-code-index-search-provider.h 
b/src/plugins/code-index/ide-code-index-search-provider.h
index ce0d36bb5..11c3fac05 100644
--- a/src/plugins/code-index/ide-code-index-search-provider.h
+++ b/src/plugins/code-index/ide-code-index-search-provider.h
@@ -24,7 +24,6 @@ G_BEGIN_DECLS
 
 #define IDE_TYPE_CODE_INDEX_SEARCH_PROVIDER (ide_code_index_search_provider_get_type ())
 
-G_DECLARE_FINAL_TYPE (IdeCodeIndexSearchProvider, ide_code_index_search_provider,
-                      IDE, CODE_INDEX_SEARCH_PROVIDER, IdeObject)
+G_DECLARE_FINAL_TYPE (IdeCodeIndexSearchProvider, ide_code_index_search_provider, IDE, 
CODE_INDEX_SEARCH_PROVIDER, IdeObject)
 
 G_END_DECLS