Code style, cleanup

Author: Jeremy Wootten

plugins/word-completion/completion-provider.vala

@@ -19,9 +19,11 @@
  *
  */
 
-public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider, Object {
-    public string name;
-    public int priority;
+public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider, GLib.Object {
+    public string name { get; construct; }
+    public int priority { get; construct; }
+    public int interactive_delay { get; construct; }
+    public Gtk.SourceCompletionActivation activation { get; construct; }
 
     public const string COMPLETION_END_MARK_NAME = "ScratchWordCompletionEnd";
     public const string COMPLETION_START_MARK_NAME = "ScratchWordCompletionStart";
@@ -43,30 +45,25 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
 
     public CompletionProvider (
         Euclide.Completion.Parser _parser,
-        Gtk.TextView _view
+        Scratch.Services.Document _doc
         ) {
 
         Object (
             parser: _parser,
-            view: _view
+            view: _doc.source_view,
+            name: _("%s - Word Completion").printf (_doc.get_basename ())
         );
     }
 
     construct {
+        interactive_delay = (int) Completion.INTERACTIVE_DELAY;
+        activation = INTERACTIVE | USER_REQUESTED;
         Gtk.TextIter iter;
         view.buffer.get_iter_at_offset (out iter, 0);
         completion_end_mark = buffer.create_mark (COMPLETION_END_MARK_NAME, iter, false);
         completion_start_mark = buffer.create_mark (COMPLETION_START_MARK_NAME, iter, false);
     }
 
-    public override string get_name () {
-        return this.name;
-    }
-
-    public override int get_priority () {
-        return this.priority;
-    }
-
     public override bool match (Gtk.SourceCompletionContext context) {
         int end_pos = buffer.cursor_position;
         int start_pos = end_pos;
@@ -114,15 +111,6 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
         return true;
     }
 
-    public override Gtk.SourceCompletionActivation get_activation () {
-        return Gtk.SourceCompletionActivation.INTERACTIVE |
-               Gtk.SourceCompletionActivation.USER_REQUESTED;
-    }
-
-    public override int get_interactive_delay () {
-        return 500;
-    }
-
     public override bool get_start_iter (Gtk.SourceCompletionContext context,
                                 Gtk.SourceCompletionProposal proposal,
                                 out Gtk.TextIter iter) {
@@ -132,6 +120,9 @@ public class Scratch.Plugins.CompletionProvider : Gtk.SourceCompletionProvider,
         return true;
     }
 
+    public override string get_name () {
+        return name;
+    }
 
     private bool get_proposals (out GLib.List<Gtk.SourceCompletionItem>? props, bool no_minimum) {
         string to_find = "";

plugins/word-completion/plugin.vala

@@ -21,6 +21,8 @@
 public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
 
     public const int MAX_TOKENS = 1000000;
+    public const uint INTERACTIVE_DELAY = 500;
+
     private const uint [] ACTIVATE_KEYS = {
         Gdk.Key.Return,
         Gdk.Key.KP_Enter,
@@ -36,8 +38,10 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
     public Object object { owned get; construct; }
 
     private List<Gtk.SourceView> text_view_list = new List<Gtk.SourceView> ();
-    private Euclide.Completion.Parser parser {get; private set;}
-    private Gtk.SourceView? current_view {get; private set;}
+    private Euclide.Completion.Parser parser;
+    private Gtk.SourceView? current_view;
+    private Gtk.SourceCompletion? current_completion;
+    private Scratch.Plugins.CompletionProvider current_provider;
     private Scratch.Services.Document current_document {get; private set;}
     private MainWindow main_window;
     private Scratch.Services.Interface plugins;
@@ -76,29 +80,30 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
 
         current_document = doc;
         current_view = doc.source_view;
+        current_completion = current_view.completion;
         current_view.buffer.insert_text.connect (on_insert_text);
         current_view.buffer.delete_range.connect (on_delete_range);
 
-        current_view.completion.show.connect (() => {
+        current_completion.show.connect (() => {
             completion_in_progress = true;
         });
 
-        current_view.completion.hide.connect (() => {
+        current_completion.hide.connect (() => {
             completion_in_progress = false;
         });
 
         if (text_view_list.find (current_view) == null) {
             text_view_list.append (current_view);
         }
 
-        var comp_provider = new Scratch.Plugins.CompletionProvider (parser, current_view);
-        comp_provider.priority = 1;
-        comp_provider.name = provider_name_from_document (doc);
+        current_provider = new Scratch.Plugins.CompletionProvider (parser, doc);
 
         try {
-            current_view.completion.add_provider (comp_provider);
-            current_view.completion.show_headers = true;
-            current_view.completion.show_icons = true;
+            current_completion.add_provider (current_provider);
+            current_completion.show_headers = true;
+            current_completion.show_icons = true;
+            current_completion.accelerators = 9;
+            current_completion.select_on_show = true;
         } catch (Error e) {
             critical (
                 "Could not add completion provider to %s. %s\n",
@@ -180,10 +185,7 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
                 return Source.REMOVE;
             });
         }
-    }
 
-    private string provider_name_from_document (Scratch.Services.Document doc) {
-        return _("%s - Word Completion").printf (doc.get_basename ());
     }
 
     private void cleanup () {
@@ -195,13 +197,10 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
         current_view.buffer.delete_range.disconnect (on_delete_range);
         // Disconnect show completion??
 
-        current_view.completion.get_providers ().foreach ((p) => {
+        current_completion.get_providers ().foreach ((p) => {
             try {
                 /* Only remove provider added by this plug in */
-                if (p.get_name () == provider_name_from_document (current_document)) {
-                    debug ("removing provider %s", p != null ? p.get_name () : "null");
-                    current_view.completion.remove_provider (p);
-                }
+                current_completion.remove_provider (current_provider);
             } catch (Error e) {
                 warning (e.message);
             }

plugins/word-completion/prefix-tree.vala

@@ -24,7 +24,9 @@
     private GLib.StringBuilder sb;
     private uint reaper_timeout_id = 0;
     private bool delay_reaping = false;
-    private const uint REAPING_THROTTLE_MS = 500;
+    // Reaping need not occur before completions shown since non-occurring words are
+    // not shown anyway.
+    private const uint REAPING_THROTTLE_MS = Completion.INTERACTIVE_DELAY * 2;
     private bool reaping_cancelled = false;
 
     public bool completed { get; set; default = false; }
@@ -85,9 +87,7 @@
                     delay_reaping = false;
                     return Source.CONTINUE;
                 } else {
-                    debug ("reaping timeout");
                     reaper_timeout_id = 0;
-                    // var words_to_remove = get_words_to_remove ();
                     debug ("reaping");
                     words_to_remove.foreach ((end_node) => {
                         if (reaping_cancelled) {