[gnome-builder] symbol-tree: be more assertive
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] symbol-tree: be more assertive
- Date: Thu, 4 Jan 2018 03:00:25 +0000 (UTC)
commit 632556b6c5b3f4e3b00dc884a250496d85d8722f
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 3 19:00:09 2018 -0800
symbol-tree: be more assertive
.../symbol-tree/gbp-symbol-layout-stack-addin.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/symbol-tree/gbp-symbol-layout-stack-addin.c
b/src/plugins/symbol-tree/gbp-symbol-layout-stack-addin.c
index 69bade0..e5e3b47 100644
--- a/src/plugins/symbol-tree/gbp-symbol-layout-stack-addin.c
+++ b/src/plugins/symbol-tree/gbp-symbol-layout-stack-addin.c
@@ -41,7 +41,6 @@ struct _GbpSymbolLayoutStackAddin {
typedef struct
{
GPtrArray *resolvers;
-
IdeBuffer *buffer;
IdeSourceLocation *location;
} SymbolResolverTaskData;
@@ -51,6 +50,8 @@ symbol_resolver_task_data_free (SymbolResolverTaskData *data)
{
g_assert (data != NULL);
g_assert (data->resolvers != NULL);
+ g_assert (data->buffer != NULL);
+ g_assert (IDE_IS_BUFFER (data->buffer));
g_clear_pointer (&data->resolvers, g_ptr_array_unref);
g_clear_object (&data->buffer);
@@ -91,14 +92,21 @@ gbp_symbol_layout_stack_addin_find_scope_cb (GObject *object,
g_assert (G_IS_TASK (task));
symbol = ide_symbol_resolver_find_nearest_scope_finish (symbol_resolver, result, &error);
+ g_assert (symbol != NULL || error != NULL);
self = g_task_get_source_object (task);
+ g_assert (GBP_IS_SYMBOL_LAYOUT_STACK_ADDIN (self));
+
data = g_task_get_task_data (task);
+ g_assert (data != NULL);
+ g_assert (IDE_IS_BUFFER (data->buffer));
+ g_assert (data->resolvers != NULL);
+ g_assert (data->resolvers->len > 0);
g_ptr_array_remove_index (data->resolvers, data->resolvers->len - 1);
/* If symbol is not found and symbol resolvers are left try those */
- if (symbol == NULL && data->resolvers->len)
+ if (symbol == NULL && data->resolvers->len > 0)
{
IdeSymbolResolver *resolver;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]