Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change key to trigger rebuild completion word list #1149

Merged
merged 4 commits into from
Sep 6, 2022
Merged

Change key to trigger rebuild completion word list #1149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c42b0d
Change key to trigger rebuild completion word list
jeremypw Dec 7, 2021
c842f88
Merge branch 'master' into fix-refresh-completion
danirabbit Aug 31, 2022
cb69826
Use keyval for USER_REQUESTED_KEY
Sep 2, 2022
0880e33
Merge branch 'master' into fix-refresh-completion
danirabbit Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions plugins/word-completion/plugin.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
Gdk.Key.ISO_Left_Tab,
};

private const uint USER_REQUESTED_KEY = Gdk.Key.backslash;
private const uint REFRESH_SHORTCUT = Gdk.Key.bar; //"|" in combination with <Ctrl> will cause refresh

private uint timeout_id = 0;

Expand Down Expand Up @@ -121,9 +121,7 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
}

private bool on_key_press (Gtk.Widget view, Gdk.EventKey event) {
uint kv = event.keyval;
unichar uc = (unichar)(Gdk.keyval_to_unicode (kv));

var kv = event.keyval;
/* Pass through any modified keypress except Shift or Capslock */
Gdk.ModifierType mods = event.state & Gdk.ModifierType.MODIFIER_MASK
& ~Gdk.ModifierType.SHIFT_MASK
Expand All @@ -134,15 +132,20 @@ public class Scratch.Plugins.Completion : Peas.ExtensionBase, Peas.Activatable {
* alternative and also purges spelling mistakes and unused words from the list.
* If used when a word or part of a word is selected, the selection will be
* used as the word to find. */
if ((mods & Gdk.ModifierType.CONTROL_MASK) > 0 && (kv == USER_REQUESTED_KEY)) {

if ((mods & Gdk.ModifierType.CONTROL_MASK) > 0 &&
(kv == REFRESH_SHORTCUT)) {

parser.rebuild_word_list (current_view);
current_view.show_completion ();
return true;
}
}

var uc = (unichar)(Gdk.keyval_to_unicode (kv));
if (!completion_in_progress && Euclide.Completion.Parser.is_delimiter (uc) &&
(uc.isprint () || uc.isspace ())) {

var buffer = current_view.buffer;
var mark = buffer.get_insert ();
Gtk.TextIter cursor_iter;
Expand Down