[gnome-builder] plugins/restore-cursor: general cleanup

[Christian Hergert <chergert src gnome org>]

commit 357b342fcd501df86381b704216d6c03853bc4c2
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 11 23:15:48 2022 -0700

    plugins/restore-cursor: general cleanup

 .../gbp-restore-cursor-buffer-addin.c              | 31 ++++++++++++++++------
 src/plugins/restore-cursor/restore-cursor-plugin.c |  1 +
 src/plugins/restore-cursor/restore-cursor.plugin   |  1 -
 3 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c 
b/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
index 9db5ebdcf..4418ada18 100644
--- a/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
+++ b/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
@@ -35,6 +35,8 @@ struct _GbpRestoreCursorBufferAddin
   GObject parent_instance;
 };
 
+static GSettings *settings;
+
 static void
 gbp_restore_cursor_buffer_addin_file_saved (IdeBufferAddin *addin,
                                             IdeBuffer      *buffer,
@@ -45,6 +47,8 @@ gbp_restore_cursor_buffer_addin_file_saved (IdeBufferAddin *addin,
   GtkTextMark *insert;
   GtkTextIter iter;
 
+  IDE_ENTRY;
+
   g_assert (IDE_IS_MAIN_THREAD ());
   g_assert (GBP_IS_RESTORE_CURSOR_BUFFER_ADDIN (addin));
   g_assert (IDE_IS_BUFFER (buffer));
@@ -56,8 +60,12 @@ gbp_restore_cursor_buffer_addin_file_saved (IdeBufferAddin *addin,
                               gtk_text_iter_get_line (&iter),
                               gtk_text_iter_get_line_offset (&iter));
 
+  g_debug ("Saving insert mark at %s", position);
+
   if (!g_file_set_attribute_string (file, IDE_FILE_ATTRIBUTE_POSITION, position, 0, NULL, &error))
     g_warning ("Failed to persist cursor position: %s", error->message);
+
+  IDE_EXIT;
 }
 
 static void
@@ -73,26 +81,28 @@ gbp_restore_cursor_buffer_addin_file_loaded_cb (GObject      *object,
   guint line_offset = 0;
   guint line = 0;
 
+  IDE_ENTRY;
+
   g_assert (G_IS_FILE (file));
   g_assert (G_IS_ASYNC_RESULT (result));
   g_assert (IDE_IS_BUFFER (buffer));
 
   /* Don't do anything if the user already moved */
   if (!_ide_buffer_can_restore_cursor (buffer))
-    return;
+    IDE_EXIT;
 
   if (!(file_info = g_file_query_info_finish (file, result, &error)))
-    return;
+    IDE_EXIT;
 
   if (!g_file_info_has_attribute (file_info, IDE_FILE_ATTRIBUTE_POSITION) ||
       !(attr = g_file_info_get_attribute_string (file_info, IDE_FILE_ATTRIBUTE_POSITION)))
-    return;
+    IDE_EXIT;
 
   if (sscanf (attr, "%u:%u", &line, &line_offset) >= 1)
     {
       GtkTextIter iter;
 
-      IDE_TRACE_MSG ("Restoring insert mark to %u:%u", line + 1, line_offset + 1);
+      g_debug ("Restoring insert mark to %u:%u", line + 1, line_offset + 1);
       gtk_text_buffer_get_iter_at_line_offset (GTK_TEXT_BUFFER (buffer),
                                                &iter,
                                                line,
@@ -101,6 +111,8 @@ gbp_restore_cursor_buffer_addin_file_loaded_cb (GObject      *object,
 
       _ide_buffer_request_scroll_to_cursor (buffer);
     }
+
+  IDE_EXIT;
 }
 
 static void
@@ -108,7 +120,7 @@ gbp_restore_cursor_buffer_addin_file_loaded (IdeBufferAddin *addin,
                                              IdeBuffer      *buffer,
                                              GFile          *file)
 {
-  g_autoptr(GSettings) settings = NULL;
+  IDE_ENTRY;
 
   g_assert (IDE_IS_MAIN_THREAD ());
   g_assert (GBP_IS_RESTORE_CURSOR_BUFFER_ADDIN (addin));
@@ -116,9 +128,8 @@ gbp_restore_cursor_buffer_addin_file_loaded (IdeBufferAddin *addin,
   g_assert (G_IS_FILE (file));
 
   /* Make sure our setting isn't disabled */
-  settings = g_settings_new ("org.gnome.builder.editor");
   if (!g_settings_get_boolean (settings, "restore-insert-mark"))
-    return;
+    IDE_EXIT;
 
   g_file_query_info_async (file,
                            IDE_FILE_ATTRIBUTE_POSITION,
@@ -127,6 +138,8 @@ gbp_restore_cursor_buffer_addin_file_loaded (IdeBufferAddin *addin,
                            NULL,
                            gbp_restore_cursor_buffer_addin_file_loaded_cb,
                            g_object_ref (buffer));
+
+  IDE_EXIT;
 }
 
 static void
@@ -137,7 +150,7 @@ buffer_addin_iface_init (IdeBufferAddinInterface *iface)
 }
 
 G_DEFINE_FINAL_TYPE_WITH_CODE (GbpRestoreCursorBufferAddin, gbp_restore_cursor_buffer_addin, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (IDE_TYPE_BUFFER_ADDIN, buffer_addin_iface_init))
+                               G_IMPLEMENT_INTERFACE (IDE_TYPE_BUFFER_ADDIN, buffer_addin_iface_init))
 
 static void
 gbp_restore_cursor_buffer_addin_class_init (GbpRestoreCursorBufferAddinClass *klass)
@@ -147,4 +160,6 @@ gbp_restore_cursor_buffer_addin_class_init (GbpRestoreCursorBufferAddinClass *kl
 static void
 gbp_restore_cursor_buffer_addin_init (GbpRestoreCursorBufferAddin *self)
 {
+  if (settings == NULL)
+    settings = g_settings_new ("org.gnome.builder.editor");
 }
diff --git a/src/plugins/restore-cursor/restore-cursor-plugin.c 
b/src/plugins/restore-cursor/restore-cursor-plugin.c
index d11164791..de6ce3c07 100644
--- a/src/plugins/restore-cursor/restore-cursor-plugin.c
+++ b/src/plugins/restore-cursor/restore-cursor-plugin.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <libpeas/peas.h>
+
 #include <libide-code.h>
 
 #include "gbp-restore-cursor-buffer-addin.h"
diff --git a/src/plugins/restore-cursor/restore-cursor.plugin 
b/src/plugins/restore-cursor/restore-cursor.plugin
index 3b2d24362..f28321d84 100644
--- a/src/plugins/restore-cursor/restore-cursor.plugin
+++ b/src/plugins/restore-cursor/restore-cursor.plugin
@@ -2,7 +2,6 @@
 Authors=Christian Hergert <christian hergert me>
 Builtin=true
 Copyright=Copyright © 2018 Christian Hergert
-Depends=editor;
 Description=Restore cursors when a buffer is re-opened.
 Embedded=_gbp_restore_cursor_register_types
 Hidden=true