[gnome-builder/wip/gtk4-port: 849/1774] plugins/clang: more resiliency fixes for highlighter

[Christian Hergert <chergert src gnome org>]

commit 0637903a76a97ac3394e68245245b6a2cba54c24
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 2 17:41:56 2022 -0700

    plugins/clang: more resiliency fixes for highlighter

 src/plugins/clang/ide-clang-highlighter.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/src/plugins/clang/ide-clang-highlighter.c b/src/plugins/clang/ide-clang-highlighter.c
index 281221f9d..bf689fb21 100644
--- a/src/plugins/clang/ide-clang-highlighter.c
+++ b/src/plugins/clang/ide-clang-highlighter.c
@@ -128,11 +128,19 @@ get_index_flags_cb (GObject      *object,
   g_assert (G_IS_ASYNC_RESULT (result));
   g_assert (IDE_IS_TASK (task));
 
+  file = ide_task_get_task_data (task);
+  cancellable = ide_task_get_cancellable (task);
+
+  g_assert (G_IS_FILE (file));
+  g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
+
   flags = ide_build_system_get_build_flags_finish (build_system, result, &error);
+
+  if (ide_task_return_error_if_cancelled (task))
+    return;
+
   context = ide_object_get_context (IDE_OBJECT (build_system));
   client = ide_object_ensure_child_typed (IDE_OBJECT (context), IDE_TYPE_CLANG_CLIENT);
-  file = ide_task_get_task_data (task);
-  cancellable = ide_task_get_cancellable (task);
 
   ide_clang_client_get_highlight_index_async (client,
                                               file,
@@ -324,7 +332,8 @@ ide_clang_highlighter_do_update (IdeClangHighlighter *self)
 
   self->queued_source = 0;
 
-  if (self->engine == NULL ||
+  if (!ide_object_check_ready (IDE_OBJECT (self), NULL) ||
+      self->engine == NULL ||
       !(buffer = ide_highlight_engine_get_buffer (self->engine)) ||
       !(file = ide_buffer_get_file (buffer)) ||
       !(context = ide_object_get_context (IDE_OBJECT (self))) ||