Merge lp:~jeremy-munsch/synapse-project/native-de-shortcut into lp:synapse-project

[Jérémy Munsch]

Add shortcut ctrl+backspace for delete word

[Rico Tzschichholz (ricotz)]

https://paste.debian.net/plain/333517

"remove_last_word" is not working correctly so please test this part more.

"Hello you" > ""
"Hello you " > "Hello"
-> both should result in "Hello " or "Hello"?

review: Needs Fixing

[Jérémy Munsch (jeremy-munsch)]

Well i just tested:

"Hello you" > "Hello" *OK*
"Hello you " > "Hello you" *NO OK*

also :
"Hello" > "" *OK*
"Hello " > "" *NO OK*
"Hello you little" > "Hello you" *OK*
"Hello you little " > "Hello you little" *NO OK*

I cannot reproduce "Hello you" > "", this is unwanted behaviour indeed.

I'll make corrections

[Jérémy Munsch (jeremy-munsch)]

Sorry i mistaped test:

"Hello " > "Hello" *NO OK*

[Jérémy Munsch (jeremy-munsch)]

launchpad is removing multiple spaces, but it check words like '_' == ' '
"Hello_you______little" > "Hello_you" *OK*
"Hello_you________little_" > "Hello_you ________little" *NO OK*

[Rico Tzschichholz (ricotz)]

Ok, looks like it gets called twice on my system, so "remove_last_word" is called to often but what it does is correct.

[Jérémy Munsch (jeremy-munsch)]

Test cases
http://paste.ubuntu.com/13330180/

[Jérémy Munsch (jeremy-munsch)]

> Ok, looks like it gets called twice on my system, so "remove_last_word" is
> called to often but what it does is correct.

That may be the input method again, this is causing lot of troubles (é_è) <-- sad dude

Which input metod are you using ? Does using GTK_IM_METHOD changes this ?
I am using GTK_IM_METHOD='' synapse on my system, otherwise it crash, this is also a workaround for #1500912

[Rico Tzschichholz (ricotz)]

Hmm, right, here it is the default: GTK_IM_MODULE="ibus"
With GTK_IM_MODULE="" it works as it is intended.

[Rico Tzschichholz (ricotz)]

Do not make the argument owned.

The trailing space should be preserved after cutting off the last word.

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

I have taken a look at the remove_last_word method.

It should work in all cases that way
https://paste.debian.net/plain/333745

Jfyi, regarding "space_index = -1 == space_index ? 0 : space_index+1;". You can't simply do "space_index+1" since this might not be a valid byte-position in this utf8 string.

review: Needs Fixing

[lp:~jeremy-munsch/synapse-project/native-de-shortcut]

631. By Jérémy Munsch on 2015-11-19

Add shortcut ctrl+backspace for delete word

[Jérémy Munsch (jeremy-munsch)]

Ok thank you, I applied the patch.

> Jfyi, regarding "space_index = -1 == space_index ? 0 : space_index+1;". You
> can't simply do "space_index+1" since this might not be a valid byte-position
> in this utf8 string.

Indeed I haven't taught about that.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'src/core/utils.vala'
--- src/core/utils.vala	2015-11-15 17:19:04 +0000
+++ src/core/utils.vala	2015-11-19 09:11:53 +0000
@@ -54,6 +54,32 @@
       return input.substring (0, len);
     }
 
+    public static string remove_last_word (string input)
+    {
+      long char_count = input.char_count ();
+      int index = input.index_of_nth_char (char_count - 1);
+      unichar pchar = input.get_char (index);
+
+      while (pchar == ' ' && index > 0)
+      {
+        input.get_prev_char (ref index, out pchar);
+      }
+
+      int next_index = index;
+
+      do
+      {
+        index = next_index;
+        input.get_prev_char (ref next_index, out pchar);
+      }
+      while (pchar != ' ' && next_index > 0);
+
+      if (next_index <= 0)
+        return "";
+      else
+        return input.slice (0, index);
+    }
+
     public static async bool query_exists_async (GLib.File f)
     {
       bool exists;
 
=== modified file 'src/ui/controller.vala'
--- src/ui/controller.vala	2014-07-10 11:39:28 +0000
+++ src/ui/controller.vala	2015-11-19 09:11:53 +0000
@@ -231,6 +231,14 @@
       }
     }
 
+    protected void search_delete_word ()
+    {
+      if (model.query[model.searching_for] == "") return;
+      model.query[model.searching_for] = Synapse.Utils.remove_last_word (model.query[model.searching_for]);
+
+      search ();
+    }
+
     protected void search_add_delete_char (string? newchar = null)
     {
       if (newchar == null)
@@ -246,6 +254,12 @@
         model.query[model.searching_for] =
               model.query[model.searching_for] + newchar;
       }
+
+      search ();
+    }
+    
+    void search ()
+    {
       switch (model.searching_for)
       {
         case SearchingFor.SOURCES:
@@ -299,6 +313,9 @@
           case KeyComboConfig.Commands.SEARCH_DELETE_CHAR:
             search_add_delete_char ();
             break;
+          case KeyComboConfig.Commands.SEARCH_DELETE_WORD:
+            search_delete_word ();
+            break;
           case KeyComboConfig.Commands.CLEAR_SEARCH_OR_HIDE:
             clear_search_or_hide_pressed ();
             break;
 
=== modified file 'src/ui/keybindings.vala'
--- src/ui/keybindings.vala	2014-07-10 11:39:28 +0000
+++ src/ui/keybindings.vala	2015-11-19 09:11:53 +0000
@@ -31,6 +31,7 @@
       ACTIVATE,
       INVALID_COMMAND,
       SEARCH_DELETE_CHAR,
+      SEARCH_DELETE_WORD,
       NEXT_RESULT,
       PREV_RESULT,
       NEXT_CATEGORY,
@@ -55,6 +56,7 @@
     public string execute { get; set; default = "Return"; }
     public string execute_without_hide { get; set; default = "<Shift>Return"; }
     public string delete_char { get; set; default = "BackSpace"; }
+    public string delete_word { get; set; default = "<Control>BackSpace"; }
     public string alternative_delete_char { get; set; default = "Delete"; }
     public string next_match { get; set; default = "Down"; }
     public string prev_match { get; set; default = "Up"; }
@@ -168,6 +170,8 @@
       kcs.set_keycombo_command (keyval, mods, Commands.SEARCH_DELETE_CHAR);
       name_to_key_mod (alternative_delete_char, out keyval, out mods);
       kcs.set_keycombo_command (keyval, mods, Commands.SEARCH_DELETE_CHAR);
+      name_to_key_mod (delete_word, out keyval, out mods);
+      kcs.set_keycombo_command (keyval, mods, Commands.SEARCH_DELETE_WORD);
       name_to_key_mod (next_match, out keyval, out mods);
       kcs.set_keycombo_command (keyval, mods, Commands.NEXT_RESULT);
       name_to_key_mod (prev_match, out keyval, out mods);