[gnome-builder] buffer: load symbol resolvers when plugins change

[Christian Hergert <chergert src gnome org>]

commit 95eb99f87bd54531b81611738f7e93bc0dc71d28
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jan 19 19:41:46 2018 -0800

    buffer: load symbol resolvers when plugins change
    
    If the extension is updated in a delayed fashion, we still want to ensure
    that the resolvers are loaded/unloaded as necessary. So separate the
    load/unload from the signal we use to track loading has completed.

 src/libide/buffers/ide-buffer.c | 65 +++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 9 deletions(-)
---
diff --git a/src/libide/buffers/ide-buffer.c b/src/libide/buffers/ide-buffer.c
index c8c0c8de8..35d1b38cc 100644
--- a/src/libide/buffers/ide-buffer.c
+++ b/src/libide/buffers/ide-buffer.c
@@ -1190,12 +1190,51 @@ ide_buffer_load_rename_provider (IdeBuffer           *self,
 }
 
 static void
-ide_buffer_load_symbol_resolver (IdeExtensionSetAdapter *adapter,
-                                 PeasPluginInfo         *plugin_info,
-                                 PeasExtension          *extension,
-                                 gpointer                user_data)
+ide_buffer_symbol_resolver_added (IdeExtensionSetAdapter *adapter,
+                                  PeasPluginInfo         *plugin_info,
+                                  PeasExtension          *extension,
+                                  gpointer                user_data)
 {
-  ide_symbol_resolver_load (IDE_SYMBOL_RESOLVER (extension));
+  IdeSymbolResolver *resolver = (IdeSymbolResolver *)extension;
+  IdeBuffer *self = user_data;
+
+  IDE_ENTRY;
+
+  g_assert (IDE_IS_MAIN_THREAD ());
+  g_assert (IDE_IS_EXTENSION_SET_ADAPTER (adapter));
+  g_assert (plugin_info != NULL);
+  g_assert (IDE_IS_SYMBOL_RESOLVER (resolver));
+  g_assert (IDE_IS_BUFFER (self));
+
+  IDE_TRACE_MSG ("Loading symbol resolver %s", G_OBJECT_TYPE_NAME (resolver));
+
+  ide_symbol_resolver_load (resolver);
+
+  IDE_EXIT;
+}
+
+static void
+ide_buffer_symbol_resolver_removed (IdeExtensionSetAdapter *adapter,
+                                    PeasPluginInfo         *plugin_info,
+                                    PeasExtension          *extension,
+                                    gpointer                user_data)
+{
+  IdeSymbolResolver *resolver = (IdeSymbolResolver *)extension;
+  IdeBuffer *self = user_data;
+
+  IDE_ENTRY;
+
+  g_assert (IDE_IS_MAIN_THREAD ());
+  g_assert (IDE_IS_EXTENSION_SET_ADAPTER (adapter));
+  g_assert (plugin_info != NULL);
+  g_assert (IDE_IS_SYMBOL_RESOLVER (resolver));
+  g_assert (IDE_IS_BUFFER (self));
+
+  IDE_TRACE_MSG ("Unloading symbol resolver %s", G_OBJECT_TYPE_NAME (resolver));
+
+  ide_symbol_resolver_unload (resolver);
+
+  IDE_EXIT;
 }
 
 static void
@@ -1211,10 +1250,6 @@ ide_buffer_load_symbol_resolvers (IdeBuffer              *self,
   if (!ide_extension_set_adapter_get_n_extensions (adapter))
     return;
 
-  ide_extension_set_adapter_foreach (adapter,
-                                     ide_buffer_load_symbol_resolver,
-                                     NULL);
-
   g_signal_emit (self, signals [SYMBOL_RESOLVERS_LOADED], 0);
 
   IDE_EXIT;
@@ -1417,6 +1452,18 @@ ide_buffer_constructed (GObject *object)
                            self,
                            G_CONNECT_SWAPPED);
 
+  g_signal_connect_object (priv->symbol_resolvers_adapter,
+                           "extension-added",
+                           G_CALLBACK (ide_buffer_symbol_resolver_added),
+                           self,
+                           0);
+
+  g_signal_connect_object (priv->symbol_resolvers_adapter,
+                           "extension-removed",
+                           G_CALLBACK (ide_buffer_symbol_resolver_removed),
+                           self,
+                           0);
+
   g_signal_connect (self,
                     "notify::language",
                     G_CALLBACK (ide_buffer_notify_language),