Merge lp:~vikoadi/pantheon-files/fix-path-completion into lp:~elementary-apps/pantheon-files/trunk

[Viko Adi Rahmawan]

Fix locationbar completion (lp:1376775)

Fix locationbar completion (lp:1376775)

using get_basename () for "/folder/name/" will return "name" in to_search so i just set to_search value to "" if we have "/" as path suffix

[Jeremy Wootten (jeremywootten)]

In line 12, last_slash + 1 < text.length could be changed to last_slash <= text.length to avoid an unnecessary arithmetic operation.

Other than that, I approve.

review: Approve

[Viko Adi Rahmawan (vikoadi)]

thanks Jeremy, this bug really drive me mad

[Jeremy Wootten (jeremywootten)]

Thanks for fixing this.

If you have time to try out lp:~jeremywootten/pantheon-files/all-views-vala
I would be grateful. This a substantial re-write of some of the code as
well as addressing a number of bugs so the more testing it gets the better,
to avoid any regressions.

On 10 October 2014 02:32, Viko Adi Rahmawan <email address hidden> wrote:

> thanks Jeremy, this bug really drive me mad
> --
>
> https://code.launchpad.net/~vikoadi/pantheon-files/fix-path-completion/+merge/237313
> You are reviewing the proposed merge of
> lp:~vikoadi/pantheon-files/fix-path-completion into lp:pantheon-files.
>

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:pantheon-files failed due to conflicts:

text conflict in src/View/LocationBar.vala

[lp:~vikoadi/pantheon-files/fix-path-completion]

1607. By Viko Adi Rahmawan on 2014-11-25

merge trunk

[Viko Adi Rahmawan (vikoadi)]

merge trunk

review: Needs Resubmitting

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2014-11-24 21:24:29 +0000
+++ src/View/LocationBar.vala	2014-11-25 22:50:28 +0000
@@ -311,10 +311,17 @@
 
         public void on_need_completion () {
             File file = get_file_for_path (text);
-            to_search = file.get_basename ();
+
+            // don't use get_basename (), it will return "folder" for "/folder/"
+            int last_slash = text.last_index_of_char ('/');
+            if (last_slash > -1 && last_slash < text.length)
+                to_search = text.slice (last_slash + 1, text.length);
+            else
+                to_search = "";
+
             autocompleted = false;
             multiple_completions = false;
-            
+
             if (to_search != "" && file.has_parent (null))
                 file = file.get_parent ();
             else