[evolution/wip/webkit2] EHTMLEditorView - Punctuation is added to the link

[Milan Crha <mcrha src gnome org>]

commit 50214d254e773b64be17e117c9d8472efd369a68
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Feb 24 12:57:53 2016 +0100

    EHTMLEditorView - Punctuation is added to the link

 .../composer/e-html-editor-view-dom-functions.c    |   24 +++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.c 
b/web-extensions/composer/e-html-editor-view-dom-functions.c
index d20c2d9..d9cc20e 100644
--- a/web-extensions/composer/e-html-editor-view-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-view-dom-functions.c
@@ -3621,7 +3621,8 @@ create_anchor_for_link (const GMatchInfo *info,
                         GString *res,
                         gpointer data)
 {
-       gint offset = 0;
+       gint offset = 0, truncate_from_end = 0;
+       const gchar *end_of_match = NULL;
        gchar *match;
        gboolean address_surrounded;
 
@@ -3642,26 +3643,47 @@ create_anchor_for_link (const GMatchInfo *info,
        if (address_surrounded)
                g_string_append (res, "&lt;");
 
+       if (!address_surrounded) {
+               end_of_match = match + strlen (match) - 1;
+               /* Taken from camel-url-scanner.c */
+               /* URLs are extremely unlikely to end with any punctuation, so
+                * strip any trailing punctuation off from link and put it after
+                * the link. Do the same for any closing double-quotes as well. */
+               while (end_of_match && end_of_match != match && strchr (",.:;?!-|}])\"", *end_of_match)) {
+                       truncate_from_end++;
+                       end_of_match--;
+               }
+       }
        g_string_append (res, "<a href=\"");
        if (strstr (match, "@") && !strstr (match, "://")) {
                g_string_append (res, "mailto:";);
                g_string_append (res, match + offset);
                if (address_surrounded)
                        g_string_truncate (res, res->len - 4);
+               else if (truncate_from_end > 0)
+                       g_string_truncate (res, res->len - truncate_from_end);
 
                g_string_append (res, "\">");
                g_string_append (res, match + offset);
                if (address_surrounded)
                        g_string_truncate (res, res->len - 4);
+               else if (truncate_from_end > 0)
+                       g_string_truncate (res, res->len - truncate_from_end);
        } else {
                g_string_append (res, match + offset);
+               if (truncate_from_end > 0)
+                       g_string_truncate (res, res->len - truncate_from_end);
                g_string_append (res, "\">");
                g_string_append (res, match + offset);
+               if (truncate_from_end > 0)
+                       g_string_truncate (res, res->len - truncate_from_end);
        }
        g_string_append (res, "</a>");
 
        if (address_surrounded)
                g_string_append (res, "&gt;");
+       else if (truncate_from_end > 0)
+               g_string_append (res, end_of_match + 1);
 
        g_free (match);