GNOME.org
 

[gnome-builder] plugins: Fix completion provider priorities

commit 810286ca67fb421c687fa220f2dcfae3ea9d1c5d
Author: JCWasmx86 <jcwasmx86 t-online de>
Date:   Fri Jul 15 18:26:10 2022 +0000

    plugins: Fix completion provider priorities

 src/libide/lsp/ide-lsp-completion-provider.h             |  2 +-
 .../bash-language-server/gbp-bash-completion-provider.c  | 16 +---------------
 .../blueprint/gbp-blueprint-completion-provider.c        | 16 +---------------
 src/plugins/clang/ide-clang-completion-provider.c        |  4 ++--
 src/plugins/clangd/gbp-clangd-completion-provider.c      | 16 +---------------
 src/plugins/gopls/gbp-gopls-completion-provider.c        | 16 +---------------
 .../html-completion/ide-html-completion-provider.c       |  2 +-
 .../intelephense/gbp-intelephense-completion-provider.c  | 16 +---------------
 src/plugins/jdtls/gbp-jdtls-completion-provider.c        | 16 +---------------
 .../jedi-language-server/gbp-jedi-completion-provider.c  | 16 +---------------
 .../ts-language-server/gbp-tslsp-completion-provider.c   | 16 +---------------
 src/plugins/vls/gbp-vls-completion-provider.c            | 16 +---------------
 src/plugins/words/gbp-word-completion-provider.c         |  2 +-
 13 files changed, 14 insertions(+), 140 deletions(-)
---
diff --git a/src/libide/lsp/ide-lsp-completion-provider.h b/src/libide/lsp/ide-lsp-completion-provider.h
index 14583ce76..3fa897489 100644
--- a/src/libide/lsp/ide-lsp-completion-provider.h
+++ b/src/libide/lsp/ide-lsp-completion-provider.h
@@ -31,7 +31,7 @@
 G_BEGIN_DECLS
 
 #define IDE_TYPE_LSP_COMPLETION_PROVIDER (ide_lsp_completion_provider_get_type())
-#define IDE_LSP_COMPLETION_PROVIDER_PRIORITY 200
+#define IDE_LSP_COMPLETION_PROVIDER_PRIORITY (-200)
 
 IDE_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE (IdeLspCompletionProvider, ide_lsp_completion_provider, IDE, 
LSP_COMPLETION_PROVIDER, IdeObject)
diff --git a/src/plugins/bash-language-server/gbp-bash-completion-provider.c 
b/src/plugins/bash-language-server/gbp-bash-completion-provider.c
index 5c6a8fa13..2021d01b7 100644
--- a/src/plugins/bash-language-server/gbp-bash-completion-provider.c
+++ b/src/plugins/bash-language-server/gbp-bash-completion-provider.c
@@ -45,21 +45,7 @@ gbp_bash_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_bash_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                           GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_bash_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpBashCompletionProvider, gbp_bash_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpBashCompletionProvider, gbp_bash_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_bash_completion_provider_class_init (GbpBashCompletionProviderClass *klass)
diff --git a/src/plugins/blueprint/gbp-blueprint-completion-provider.c 
b/src/plugins/blueprint/gbp-blueprint-completion-provider.c
index bf9809b42..56fd27716 100644
--- a/src/plugins/blueprint/gbp-blueprint-completion-provider.c
+++ b/src/plugins/blueprint/gbp-blueprint-completion-provider.c
@@ -45,21 +45,7 @@ gbp_blueprint_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_blueprint_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                           GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_blueprint_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpBlueprintCompletionProvider, gbp_blueprint_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpBlueprintCompletionProvider, gbp_blueprint_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_blueprint_completion_provider_class_init (GbpBlueprintCompletionProviderClass *klass)
diff --git a/src/plugins/clang/ide-clang-completion-provider.c 
b/src/plugins/clang/ide-clang-completion-provider.c
index 24c4b4baa..f97697fd9 100644
--- a/src/plugins/clang/ide-clang-completion-provider.c
+++ b/src/plugins/clang/ide-clang-completion-provider.c
@@ -76,9 +76,9 @@ ide_clang_completion_provider_get_priority (GtkSourceCompletionProvider *provide
 {
   /* Place results before snippets */
   if (is_field_access (context))
-    return -200;
+    return 2400;
 
-  return 100;
+  return 2500;
 }
 
 static gboolean
diff --git a/src/plugins/clangd/gbp-clangd-completion-provider.c 
b/src/plugins/clangd/gbp-clangd-completion-provider.c
index ff5e7bbd9..91a7bc42e 100644
--- a/src/plugins/clangd/gbp-clangd-completion-provider.c
+++ b/src/plugins/clangd/gbp-clangd-completion-provider.c
@@ -45,21 +45,7 @@ gbp_clangd_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_clangd_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                             GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_clangd_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpClangdCompletionProvider, gbp_clangd_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpClangdCompletionProvider, gbp_clangd_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_clangd_completion_provider_class_init (GbpClangdCompletionProviderClass *klass)
diff --git a/src/plugins/gopls/gbp-gopls-completion-provider.c 
b/src/plugins/gopls/gbp-gopls-completion-provider.c
index 40659d788..4b854af5a 100644
--- a/src/plugins/gopls/gbp-gopls-completion-provider.c
+++ b/src/plugins/gopls/gbp-gopls-completion-provider.c
@@ -45,21 +45,7 @@ gbp_gopls_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_gopls_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                           GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_gopls_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpGoplsCompletionProvider, gbp_gopls_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpGoplsCompletionProvider, gbp_gopls_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_gopls_completion_provider_class_init (GbpGoplsCompletionProviderClass *klass)
diff --git a/src/plugins/html-completion/ide-html-completion-provider.c 
b/src/plugins/html-completion/ide-html-completion-provider.c
index 8a8b11682..76b60cac0 100644
--- a/src/plugins/html-completion/ide-html-completion-provider.c
+++ b/src/plugins/html-completion/ide-html-completion-provider.c
@@ -459,7 +459,7 @@ static gint
 ide_html_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
                                            GtkSourceCompletionContext  *context)
 {
-  return 200;
+  return -200;
 }
 
 static gboolean
diff --git a/src/plugins/intelephense/gbp-intelephense-completion-provider.c 
b/src/plugins/intelephense/gbp-intelephense-completion-provider.c
index b08d74f18..8be6ad3f1 100644
--- a/src/plugins/intelephense/gbp-intelephense-completion-provider.c
+++ b/src/plugins/intelephense/gbp-intelephense-completion-provider.c
@@ -45,21 +45,7 @@ gbp_intelephense_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_intelephense_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                                   GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_intelephense_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpIntelephenseCompletionProvider, gbp_intelephense_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpIntelephenseCompletionProvider, gbp_intelephense_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_intelephense_completion_provider_class_init (GbpIntelephenseCompletionProviderClass *klass)
diff --git a/src/plugins/jdtls/gbp-jdtls-completion-provider.c 
b/src/plugins/jdtls/gbp-jdtls-completion-provider.c
index a81417141..0d9ab2798 100644
--- a/src/plugins/jdtls/gbp-jdtls-completion-provider.c
+++ b/src/plugins/jdtls/gbp-jdtls-completion-provider.c
@@ -45,21 +45,7 @@ gbp_jdtls_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_jdtls_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                           GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_jdtls_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpJdtlsCompletionProvider, gbp_jdtls_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpJdtlsCompletionProvider, gbp_jdtls_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_jdtls_completion_provider_class_init (GbpJdtlsCompletionProviderClass *klass)
diff --git a/src/plugins/jedi-language-server/gbp-jedi-completion-provider.c 
b/src/plugins/jedi-language-server/gbp-jedi-completion-provider.c
index 98b258702..6e6cc3a25 100644
--- a/src/plugins/jedi-language-server/gbp-jedi-completion-provider.c
+++ b/src/plugins/jedi-language-server/gbp-jedi-completion-provider.c
@@ -45,21 +45,7 @@ gbp_jedi_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_jedi_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                           GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_jedi_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpJediCompletionProvider, gbp_jedi_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpJediCompletionProvider, gbp_jedi_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_jedi_completion_provider_class_init (GbpJediCompletionProviderClass *klass)
diff --git a/src/plugins/ts-language-server/gbp-tslsp-completion-provider.c 
b/src/plugins/ts-language-server/gbp-tslsp-completion-provider.c
index e2112bca6..04cc9b1a5 100644
--- a/src/plugins/ts-language-server/gbp-tslsp-completion-provider.c
+++ b/src/plugins/ts-language-server/gbp-tslsp-completion-provider.c
@@ -45,21 +45,7 @@ gbp_tslsp_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_tslsp_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                            GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_tslsp_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpTslspCompletionProvider, gbp_tslsp_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpTslspCompletionProvider, gbp_tslsp_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_tslsp_completion_provider_class_init (GbpTslspCompletionProviderClass *klass)
diff --git a/src/plugins/vls/gbp-vls-completion-provider.c b/src/plugins/vls/gbp-vls-completion-provider.c
index b0e346390..a57ce6005 100644
--- a/src/plugins/vls/gbp-vls-completion-provider.c
+++ b/src/plugins/vls/gbp-vls-completion-provider.c
@@ -45,21 +45,7 @@ gbp_vls_completion_provider_load (IdeLspCompletionProvider *provider)
   IDE_EXIT;
 }
 
-static int
-gbp_vls_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
-                                          GtkSourceCompletionContext  *context)
-{
-  return -1000;
-}
-
-static void
-completion_provider_iface_init (GtkSourceCompletionProviderInterface *iface)
-{
-  iface->get_priority = gbp_vls_completion_provider_get_priority;
-}
-
-G_DEFINE_FINAL_TYPE_WITH_CODE (GbpVlsCompletionProvider, gbp_vls_completion_provider, 
IDE_TYPE_LSP_COMPLETION_PROVIDER,
-                               G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER, 
completion_provider_iface_init))
+G_DEFINE_FINAL_TYPE (GbpVlsCompletionProvider, gbp_vls_completion_provider, IDE_TYPE_LSP_COMPLETION_PROVIDER)
 
 static void
 gbp_vls_completion_provider_class_init (GbpVlsCompletionProviderClass *klass)
diff --git a/src/plugins/words/gbp-word-completion-provider.c 
b/src/plugins/words/gbp-word-completion-provider.c
index bd9034717..67396d4a8 100644
--- a/src/plugins/words/gbp-word-completion-provider.c
+++ b/src/plugins/words/gbp-word-completion-provider.c
@@ -221,7 +221,7 @@ static gint
 gbp_word_completion_provider_get_priority (GtkSourceCompletionProvider *provider,
                                            GtkSourceCompletionContext  *context)
 {
-  return 1000;
+  return -10000;
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]