[gnome-builder/gnome-builder-3-24] clang: try harder to keep iter valid

[Christian Hergert <chergert src gnome org>]

commit 27858d33429b201a182dee9847a6e3676c8e859f
Author: Christian Hergert <chergert redhat com>
Date:   Tue May 16 17:34:52 2017 -0700

    clang: try harder to keep iter valid
    
    When performing our operation to activate the clang completion item, we
    want to ensure the iter passed to us stays valid. We also want to pass
    the iter location into push_snippet just to ensure we get the same
    location.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782701

 plugins/clang/ide-clang-completion-provider.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plugins/clang/ide-clang-completion-provider.c b/plugins/clang/ide-clang-completion-provider.c
index d31cdaa..5126ce2 100644
--- a/plugins/clang/ide-clang-completion-provider.c
+++ b/plugins/clang/ide-clang-completion-provider.c
@@ -722,7 +722,10 @@ ide_clang_completion_provider_activate_proposal (GtkSourceCompletionProvider *pr
   g_assert (IDE_IS_SOURCE_SNIPPET (snippet));
   g_assert (IDE_IS_SOURCE_VIEW (self->view));
 
-  ide_source_view_push_snippet (self->view, snippet, NULL);
+  ide_source_view_push_snippet (self->view, snippet, iter);
+
+  /* ensure @iter is kept valid */
+  gtk_text_buffer_get_iter_at_mark (buffer, iter, gtk_text_buffer_get_insert (buffer));
 
   IDE_RETURN (TRUE);
 }