Merge pull request #146 from areina/fix-145

Remove <dash_entry_.*> from documentation urls
dash-docs-el · Dec 7, 2016 · 351051e · 351051e
2 parents 414e2a1 + 58e117d
commit 351051e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/helm-dash.el b/helm-dash.el
@@ -458,10 +458,11 @@ candidate opts."
 	(list (car docset) row)))
 
 (defun helm-dash-result-url (docset-name filename &optional anchor)
-  "Return the full, absolute URL to documentation: either a file:/// URL joining
-DOCSET-NAME, FILENAME & ANCHOR with sanitization of spaces or a http(s):// URL
-formed as-is if FILENAME is a full HTTP(S) URL."
-  (let ((path (format "%s%s" filename (if anchor (format "#%s" anchor) ""))))
+  "Return the full, absolute URL to documentation.
+Either a file:/// URL joining DOCSET-NAME, FILENAME & ANCHOR with sanitization
+ of spaces or a http(s):// URL formed as-is if FILENAME is a full HTTP(S) URL."
+  (let* ((clean-filename (replace-regexp-in-string "<dash_entry_.*>" "" filename))
+	 (path (format "%s%s" clean-filename (if anchor (format "#%s" anchor) ""))))
     (if (string-match-p "^https?://" path)
 	path
       (replace-regexp-in-string

diff --git a/test/helm-dash-test.el b/test/helm-dash-test.el
@@ -87,6 +87,10 @@
   (should (string-match-p "Documents/three#anchor$"
                           (helm-dash-result-url "Redis" "three#anchor"))))
 
+(ert-deftest helm-dash-result-url/remove-dash-entry-tag-from-url ()
+  (should (string-match-p "Documents/three#anchor$"
+                          (helm-dash-result-url "Python 3" "three<dash_entry_menuDescription=android.provider.ContactsContract.CommonDataKinds.Website>" "anchor"))))
+
 ;;;; helm-dash-docsets-path
 
 (ert-deftest helm-dash-docsets-path-test/relative-path ()