Merge lp:~voldyman/pantheon-terminal/colon-fixed into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

Fixed bug #1213018, URLs can now have colons in it.

fixed the colon in url bug

[lp:~voldyman/pantheon-terminal/colon-fixed]

507. By Akshay Shekher on 2013-08-19

url's with colon ':' also recognized

[David Gomes (davidgomes)]

This is going to get interesting.

david@davidbuntu:~$ https://pbs.twimg.com/media/BRRfNsxCYAAHdF6.jpg:large
bash: https://pbs.twimg.com/media/BRRfNsxCYAAHdF6.jpg:large: No such file or directory

On the second URL it also catches the second ":" now.

review: Needs Fixing

[Akshay Shekher (voldyman)]

it should catch the second colon because as far as the terminal is concerned : is a valid character in a url it can be present anywhere in the URL

[David Gomes (davidgomes)]

GNOME Terminal doesn't do it though.

[Akshay Shekher (voldyman)]

do we really want to do what gnome does or add new features?

[David Gomes (davidgomes)]

I'm pretty sure URLs can't end in a ":", so yes I want to do it like GNOME.

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2013-07-30 14:03:28 +0000
+++ src/TerminalWidget.vala	2013-08-18 18:12:21 +0000
@@ -41,7 +41,7 @@
         const string HOSTCHARS_CLASS = "[-[:alnum:]]";
         const string HOST = HOSTCHARS_CLASS + "+(\\." + HOSTCHARS_CLASS + "+)*";
         const string PORT = "(?:\\:[[:digit:]]{1,5})?";
-        const string PATHCHARS_CLASS = "[-[:alnum:]\\Q_$.+!*,;@&=?/~#%\\E]";
+        const string PATHCHARS_CLASS = "[-[:alnum:]\\Q_$.+!*,;:@&=?/~#%\\E]";
         const string PATHTERM_CLASS = "[^\\Q]'.}>) \t\r\n,\"\\E]";
         const string SCHEME = """(?:news:|telnet:|nntp:|file:\/|https?:|ftps?:|sftp:|webcal:
                                  |irc:|sftp:|ldaps?:|nfs:|smb:|rsync:|ssh:|rlogin:|telnet:|git: