[elpa] externals/hyperbole 422cf12f3e 1/2: Fix multi-level hyrolo-add entry and add a test case

[ELPA Syncer]

branch: externals/hyperbole
commit 422cf12f3ef49ce1b248a9d171176e8aace741fb
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Fix multi-level hyrolo-add entry and add a test case
---
 ChangeLog            |  6 +++++
 hyrolo.el            | 65 ++++++++++++++++++++++++++++++----------------------
 test/hyrolo-tests.el | 14 ++++++++++-
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ebf46475d..5feea8a5b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-26  Bob Weiner  <rsw@gnu.org>
+
+* hyrolo.el (hyrolo-add): Fix both top-level and multi-level insertion.
+            (hyrolo-entry-name-regexp): Add.
+  test/hyrolo-tests.el (hyrolo-add-items-at-multiple-levels): Add from Mats.
+
 2022-03-20  Bob Weiner  <rsw@gnu.org>
 
 * HY-NEWS (New Tree Promotion/Demotion Keys):
diff --git a/hyrolo.el b/hyrolo.el
index 2fda1b9a2b..3869ce73a0 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     7-Jun-89 at 22:08:29
-;; Last-Mod:     20-Mar-22 at 10:53:11 by Bob Weiner
+;; Last-Mod:     26-Mar-22 at 14:57:44 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -65,6 +65,9 @@ It must contain a %s indicating where to put the entry name 
and a second
   :type 'string
   :group 'hyperbole-rolo)
 
+(defvar hyrolo-entry-name-regexp "[-_a-zA-Z0-9@.]+\\( ?, ?[-_a-zA-Z0-9@.]+\\)?"
+  "*Regexp matching a hyrolo entry name after matching to 
`hyrolo-entry-regexp'.")
+
 (defcustom hyrolo-find-file-function #'find-file
   "*Function to interactively display a `hyrolo-file-list' file for editing.
 Use the `hyrolo-edit' function instead to edit a new or existing entry."
@@ -209,14 +212,16 @@ entry which begins with the parent string."
   (let ((parent "") (level "") end)
     (widen)
     (goto-char 1)
-    (while (string-match "\\`[^\]\[<>{}\"]*/" name)
+    ;; If name includes slash level separator character, walk down
+    ;; existing matching tree of entries to find insertion point.
+    (while (string-match "\\`[^\]\[/<>{}\"]*/" name)
       (setq end (1- (match-end 0))
            parent (substring name 0 end)
            name (substring name (min (1+ end) (length name))))
       (if (re-search-forward
-          (concat hyrolo-entry-regexp (regexp-quote parent)) nil t)
+          (concat hyrolo-entry-regexp (regexp-quote parent) "\\s-") nil t)
          (setq level (match-string-no-properties hyrolo-entry-group-number))
-       (error "(hyrolo-add): `%s' category not found in \"%s\""
+       (error "(hyrolo-add): Insertion failed, `%s' parent entry not found in 
\"%s\""
               parent file)))
     (narrow-to-region (point) (progn (hyrolo-to-entry-end t (length level)) 
(point)))
     (let* ((len (length name))
@@ -233,36 +238,40 @@ entry which begins with the parent string."
       ;; to that of `name'.
       (if (and (= level-len 1)
               (equal hyrolo-entry-regexp "^\\(\\*+\\)\\([ \t]+\\)"))
-         (progn (goto-char (point-min))
-                (if (re-search-forward (concat hyrolo-entry-regexp
-                                               (regexp-quote (char-to-string 
first-char)))
-                                       nil t)
-                    (goto-char (match-beginning 0))
-                  (goto-char (point-max))
-                  (if (and (> first-char ?0)
-                           (re-search-backward
-                            (concat "^\\*[ \t]+["
-                                    (substring
-                                     
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-                                     0 (min (- first-char ?0) 62))
-                                    "]")
-                            nil t))
-                      (progn (goto-char (match-end 0))
-                             (hyrolo-to-entry-end t level-len)
-                             ;; Now at the insertion point, immediately after
-                             ;; the last existing entry whose first character
-                             ;; is less than that of `name'.  Setting `again'
-                             ;; to nil prevents further searching for an
-                             ;; insertion point.
-                             (setq again nil)))))
+         (let ((case-fold-search))
+           (goto-char (point-min))
+           (if (re-search-forward (concat hyrolo-entry-regexp
+                                          (regexp-quote (char-to-string 
first-char)))
+                                  nil t)
+               (goto-char (match-beginning 0))
+             (goto-char (point-max))
+             (if (and (> first-char ?0)
+                      (re-search-backward
+                       (concat "^\\*[ \t]+["
+                               (substring
+                                
"0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz"
+                                0 (min (- first-char ?0) 62))
+                               "])")
+                       nil t))
+                 (progn (goto-char (match-end 0))
+                        (hyrolo-to-entry-end t level-len)
+                        ;; Now at the insertion point, immediately after
+                        ;; the last existing entry whose first character
+                        ;; is less than that of `name'.  Setting `again'
+                        ;; to nil prevents further searching for an
+                        ;; insertion point.
+                        (setq again nil)))))
        (goto-char (point-min)))
 
       (while (and again (re-search-forward hyrolo-entry-regexp nil 'end))
        (setq entry-level-len (length (match-string-no-properties 
hyrolo-entry-group-number)))
        (if (/= entry-level-len level-len)
            (hyrolo-to-entry-end t entry-level-len)
-         (setq entry (buffer-substring-no-properties (point) (+ (point) len))
-               entry-spc (match-string-no-properties 
hyrolo-entry-trailing-space-group-number))
+         (setq entry-spc (match-string-no-properties 
hyrolo-entry-trailing-space-group-number)
+               entry (buffer-substring-no-properties (point)
+                                                     (save-excursion
+                                                       (re-search-forward 
hyrolo-entry-name-regexp nil t)
+                                                       (point))))
          (cond ((string-lessp entry name)
                 (hyrolo-to-entry-end t entry-level-len))
                ((string-lessp name entry)
diff --git a/test/hyrolo-tests.el b/test/hyrolo-tests.el
index 7c6d95eb54..8d1954e9df 100644
--- a/test/hyrolo-tests.el
+++ b/test/hyrolo-tests.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell <matsl@gnu.org>
 ;;
 ;; Orig-Date:    19-Jun-21 at 22:42:00
-;; Last-Mod:     20-Mar-22 at 19:57:17 by Mats Lidell
+;; Last-Mod:     26-Mar-22 at 14:56:33 by Bob Weiner
 ;;
 ;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -25,6 +25,18 @@
 (declare-function hy-test-helpers:consume-input-events "hy-test-helpers")
 (declare-function hy-test-helpers:should-last-message "hy-test-helpers")
 
+(ert-deftest hyrolo-add-items-at-multiple-levels ()
+  "Rolo files can have items at different levels."
+  (let ((hyrolo-file (make-temp-file "hypb" nil ".otl")))
+    (let ((hyrolo-file-list (list hyrolo-file)))
+      (find-file hyrolo-file)
+      (insert "===\nHdr\n===\n")
+      (goto-char (point-min))
+      (should (looking-at "==="))
+      (hyrolo-add "a")
+      (hyrolo-add "a/b")
+      (hyrolo-add "a/b/c"))))
+
 (ert-deftest hyrolo-demo-search-work ()
   "Use demo example and search for work should match work."
   (skip-unless (not noninteractive))