[gnome-builder/wip/gtk4-port] libide/gui: tweak preferences layout

[Christian Hergert <chergert src gnome org>]

commit c2a8e8946b70f22d9e73a1686f8ebc2f0e88d472
Author: Christian Hergert <chergert redhat com>
Date:   Wed Apr 6 20:25:15 2022 -0700

    libide/gui: tweak preferences layout

 src/libide/gui/ide-preferences-builtin.c              | 13 ++++++++++---
 src/plugins/editorui/gbp-editorui-preferences-addin.c |  4 +---
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/src/libide/gui/ide-preferences-builtin.c b/src/libide/gui/ide-preferences-builtin.c
index 70d1c3773..2161a54c6 100644
--- a/src/libide/gui/ide-preferences-builtin.c
+++ b/src/libide/gui/ide-preferences-builtin.c
@@ -654,8 +654,7 @@ static const IdePreferencePageEntry pages[] = {
   { NULL, "visual",   "editing",    "org.gnome.Builder-editing-symbolic",      10, N_("Editing") },
   { NULL, "visual",   "keyboard",   "org.gnome.Builder-shortcuts-symbolic",    20, N_("Shortcuts") },
   { NULL, "code",     "languages",  "org.gnome.Builder-languages-symbolic",   100, N_("Languages") },
-  { NULL, "code",     "completion", "org.gnome.Builder-completion-symbolic",  110, N_("Completion") },
-  { NULL, "code",     "insight",    "org.gnome.Builder-diagnostics-symbolic", 120, N_("Diagnostics") },
+  { NULL, "code",     "insight",    "org.gnome.Builder-diagnostics-symbolic", 120, N_("Insight") },
   { NULL, "projects", "projects",   "org.gnome.Builder-projects-symbolic",    200, N_("Projects") },
   { NULL, "tools",    "build",      "org.gnome.Builder-build-symbolic",       300, N_("Build") },
   { NULL, "tools",    "debug",      "org.gnome.Builder-debugger-symbolic",    310, N_("Debugger") },
@@ -666,7 +665,15 @@ static const IdePreferencePageEntry pages[] = {
 };
 
 static const IdePreferenceGroupEntry groups[] = {
-  { "appearance", "style",        0, N_("Appearance") },
+  { "appearance", "style",          0, N_("Appearance") },
+
+  { "insight",    "general",                0, NULL },
+  { "insight",    "completion",            10, N_("Completion") },
+  { "insight",    "completion-providers",  20, NULL },
+#if 0
+  { "insight",    "diagnostics",           30, N_("Diagnostics") },
+#endif
+  { "insight",    "diagnostics-providers", 40, N_("Diagnostics") },
 
   { "plugins",    "vcs",            0, N_("Version Control") },
   { "plugins",    "sdks",          10, N_("SDKs") },
diff --git a/src/plugins/editorui/gbp-editorui-preferences-addin.c 
b/src/plugins/editorui/gbp-editorui-preferences-addin.c
index ce19f5fc4..68839a75b 100644
--- a/src/plugins/editorui/gbp-editorui-preferences-addin.c
+++ b/src/plugins/editorui/gbp-editorui-preferences-addin.c
@@ -48,8 +48,6 @@ static const IdePreferenceGroupEntry groups[] = {
   { "languages/*", "spacing",     20, N_("Spacing") },
   { "languages/*", "indentation", 30, N_("Indentation") },
 
-  { "completion", "general",       0, N_("General") },
-
   { "keyboard",   "movement",      10, N_("Movements") },
 };
 
@@ -79,7 +77,7 @@ static const IdePreferenceItemEntry items[] = {
     N_("Use cursor position to highlight matching brackets, braces, parenthesis, and more"),
     "org.gnome.builder.editor", NULL, "highlight-matching-brackets" },
 
-  { "completion", "general", "interactive", 10, ide_preferences_window_toggle,
+  { "insight", "completion", "interactive-completion", 10, ide_preferences_window_toggle,
     N_("Suggest Completions While Typing"),
     N_("Automatically suggest completions while typing within the file"),
     "org.gnome.builder.editor", NULL, "interactive-completion" },