[gnome-builder/wip/chergert/lsp-plugin-loader] libide/lsp: add symbol resolver dynamic GType registration

[Christian Hergert <chergert src gnome org>]

commit 16ca312a5e7e15d3bfe367b7d39e6468dd680678
Author: Christian Hergert <chergert redhat com>
Date:   Thu Oct 13 18:32:57 2022 -0500

    libide/lsp: add symbol resolver dynamic GType registration

 src/libide/lsp/ide-lsp-plugin-private.h         |   4 +
 src/libide/lsp/ide-lsp-plugin-symbol-resolver.c | 100 ++++++++++++++++++++++++
 src/libide/lsp/ide-lsp-plugin.c                 |  11 +--
 src/libide/lsp/meson.build                      |   1 +
 4 files changed, 106 insertions(+), 10 deletions(-)
---
diff --git a/src/libide/lsp/ide-lsp-plugin-private.h b/src/libide/lsp/ide-lsp-plugin-private.h
index 375a66d45..3d29a1f28 100644
--- a/src/libide/lsp/ide-lsp-plugin-private.h
+++ b/src/libide/lsp/ide-lsp-plugin-private.h
@@ -35,6 +35,7 @@ typedef struct _IdeLspPluginInfo
   GType service_type;
   GType completion_provider_type;
   GType diagnostic_provider_type;
+  GType symbol_resolver_type;
 } IdeLspPluginInfo;
 
 IdeLspPluginInfo *ide_lsp_plugin_info_ref                   (IdeLspPluginInfo *info);
@@ -49,6 +50,9 @@ GObject          *ide_lsp_plugin_create_completion_provider (guint             n
 GObject          *ide_lsp_plugin_create_diagnostic_provider (guint             n_parameters,
                                                              GParameter       *parameters,
                                                              IdeLspPluginInfo *info);
+GObject          *ide_lsp_plugin_create_symbol_resolver     (guint             n_parameters,
+                                                             GParameter       *parameters,
+                                                             IdeLspPluginInfo *info);
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 G_END_DECLS
diff --git a/src/libide/lsp/ide-lsp-plugin-symbol-resolver.c b/src/libide/lsp/ide-lsp-plugin-symbol-resolver.c
new file mode 100644
index 000000000..34fa42747
--- /dev/null
+++ b/src/libide/lsp/ide-lsp-plugin-symbol-resolver.c
@@ -0,0 +1,100 @@
+/* ide-lsp-plugin-symbol-resolver.c
+ *
+ * Copyright 2022 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#define G_LOG_DOMAIN "ide-lsp-plugin-symbol-resolver"
+
+#include "config.h"
+
+#include <libpeas/peas.h>
+
+#include <libide-code.h>
+
+#include "ide-lsp-symbol-resolver.h"
+#include "ide-lsp-plugin-private.h"
+#include "ide-lsp-service.h"
+
+typedef struct _IdeLspPluginSymbolResolverClass
+{
+  IdeLspSymbolResolverClass  parent_class;
+  IdeLspPluginInfo              *info;
+} IdeLspPluginSymbolResolverClass;
+
+static void
+ide_lsp_plugin_symbol_resolver_load (IdeSymbolResolver *resolver)
+{
+  IdeLspPluginSymbolResolverClass *klass = (IdeLspPluginSymbolResolverClass *)(((GTypeInstance 
*)resolver)->g_class);
+  g_autoptr(IdeLspServiceClass) service_class = g_type_class_ref (klass->info->service_type);
+
+  ide_lsp_service_class_bind_client (service_class, IDE_OBJECT (resolver));
+}
+
+static void
+ide_lsp_plugin_symbol_resolver_class_init (IdeLspPluginSymbolResolverClass *klass,
+                                           IdeLspPluginInfo                    *info)
+{
+  klass->info = info;
+}
+
+static void
+ide_lsp_plugin_symbol_resolver_iface_init (IdeSymbolResolverInterface *iface)
+{
+  iface->load = ide_lsp_plugin_symbol_resolver_load;
+}
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+GObject *
+ide_lsp_plugin_create_symbol_resolver (guint             n_parameters,
+                                       GParameter       *parameters,
+                                       IdeLspPluginInfo *info)
+{
+  ide_lsp_plugin_remove_plugin_info_param (&n_parameters, parameters);
+
+  if G_UNLIKELY (info->symbol_resolver_type == G_TYPE_INVALID)
+    {
+      g_autofree char *name = g_strconcat (info->module_name, "+SymbolResolver", NULL);
+
+      info->symbol_resolver_type =
+        g_type_register_static (IDE_TYPE_LSP_SYMBOL_RESOLVER,
+                                name,
+                                &(GTypeInfo) {
+                                  sizeof (IdeLspPluginSymbolResolverClass),
+                                  NULL,
+                                  NULL,
+                                  (GClassInitFunc)ide_lsp_plugin_symbol_resolver_class_init,
+                                  NULL,
+                                  ide_lsp_plugin_info_ref (info),
+                                  sizeof (IdeLspSymbolResolver),
+                                  0,
+                                  NULL,
+                                  NULL,
+                                },
+                                G_TYPE_FLAG_FINAL);
+      g_type_add_interface_static (info->symbol_resolver_type,
+                                   IDE_TYPE_SYMBOL_RESOLVER,
+                                   &(GInterfaceInfo) {
+                                     (GInterfaceInitFunc)(void (*) 
(void))ide_lsp_plugin_symbol_resolver_iface_init,
+                                     NULL,
+                                     NULL,
+                                   });
+    }
+
+  return g_object_newv (info->symbol_resolver_type, n_parameters, parameters);
+}
+G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/src/libide/lsp/ide-lsp-plugin.c b/src/libide/lsp/ide-lsp-plugin.c
index b8ce48a2f..e378412a1 100644
--- a/src/libide/lsp/ide-lsp-plugin.c
+++ b/src/libide/lsp/ide-lsp-plugin.c
@@ -198,15 +198,6 @@ ide_lsp_plugin_factory (IdeLspPluginInfo *info,
   return NULL;
 }
 
-
-static GObject *
-ide_lsp_plugin_symbol_resolver_factory (guint       n_parameters,
-                                        GParameter *parameters,
-                                        gpointer    user_data)
-{
-  return ide_lsp_plugin_factory (user_data, IDE_TYPE_LSP_SYMBOL_RESOLVER, n_parameters, parameters);
-}
-
 static GObject *
 ide_lsp_plugin_highlighter_factory (guint       n_parameters,
                                     GParameter *parameters,
@@ -289,7 +280,7 @@ ide_lsp_plugin_register (PeasObjectModule     *object_module,
   if ((features & IDE_LSP_PLUGIN_FEATURES_SYMBOL_RESOLVER) != 0)
     peas_object_module_register_extension_factory (object_module,
                                                    IDE_TYPE_SYMBOL_RESOLVER,
-                                                   ide_lsp_plugin_symbol_resolver_factory,
+                                                   (PeasFactoryFunc)ide_lsp_plugin_create_symbol_resolver,
                                                    ide_lsp_plugin_info_ref (info),
                                                    (GDestroyNotify)ide_lsp_plugin_info_unref);
 
diff --git a/src/libide/lsp/meson.build b/src/libide/lsp/meson.build
index 7428c8ad8..6244b47bd 100644
--- a/src/libide/lsp/meson.build
+++ b/src/libide/lsp/meson.build
@@ -58,6 +58,7 @@ libide_lsp_public_sources = [
   'ide-lsp-plugin.c',
   'ide-lsp-plugin-completion-provider.c',
   'ide-lsp-plugin-diagnostic-provider.c',
+  'ide-lsp-plugin-symbol-resolver.c',
   'ide-lsp-rename-provider.c',
   'ide-lsp-search-provider.c',
   'ide-lsp-search-result.c',