Comments are now hidden when you fold the question

2 files changed, 35 insertions, 33 deletions

diff --git a/sx-question-mode.el b/sx-question-mode.el
index 6f5dec3..c44519c 100644
--- a/sx-question-mode.el
+++ b/sx-question-mode.el
@@ -141,9 +141,9 @@ If DIRECTION is negative, move backwards instead."
   "Hide or show section under point.
 Optional argument _ is for `push-button'."
   (interactive)
-  (let ((ov (car (or (sx-question-mode--section-overlays-at (point))
-                     (sx-question-mode--section-overlays-at
-                      (line-end-position))))))
+  (let ((ov (or (sx-question-mode--section-overlays-at
+                 (line-end-position))
+                (sx-question-mode--section-overlays-at (point)))))
     (goto-char (overlay-start ov))
     (forward-line 0)
     (overlay-put
@@ -151,9 +151,11 @@ Optional argument _ is for `push-button'."
      (null (overlay-get ov 'invisible)))))
 
 (defun sx-question-mode--section-overlays-at (pos)
-  "Return a list of `sx-question-mode--section-content' overlays at POS."
-  (cl-remove-if (lambda (x) (null (overlay-get x 'sx-question-mode--section-content)))
-                (overlays-at pos)))
+  "Return the highest priority section overlay at POS.
+A section overlay has a `sx-question-mode--section-content'
+property."
+  (cdr-safe (get-char-property-and-overlay
+             pos 'sx-question-mode--section-content nil)))
 
 
 ;;; Major-mode
diff --git a/sx-question-print.el b/sx-question-print.el
index d6d554d..307742a 100644
--- a/sx-question-print.el
+++ b/sx-question-print.el
@@ -237,35 +237,35 @@ DATA can represent a question or an answer."
                    .body_markdown)
                   "\n"
                   (propertize sx-question-mode-separator
-                              'face 'sx-question-mode-header))))
-      ;; Comments have their own `sx--data-here' property (so they can
-      ;; be upvoted too).
-      (when .comments
-        (insert "\n")
-        (insert-text-button
-         sx-question-mode-comments-title
-         'face 'sx-question-mode-title-comments
-         'sx-question-mode--section 3
-         'sx-button-copy .share_link
-         :type 'sx-question-mode-title)
-        (sx--wrap-in-overlay
-            '(sx-question-mode--section-content t)
+                              'face 'sx-question-mode-header)))
+        ;; Comments have their own `sx--data-here' property (so they can
+        ;; be upvoted too).
+        (when .comments
           (insert "\n")
+          (insert-text-button
+           sx-question-mode-comments-title
+           'face 'sx-question-mode-title-comments
+           'sx-question-mode--section 3
+           'sx-button-copy .share_link
+           :type 'sx-question-mode-title)
           (sx--wrap-in-overlay
-              '(face sx-question-mode-content-face)
-            (mapc #'sx-question-mode--print-comment .comments))
-          ;; If there are comments, we want part of this margin to go
-          ;; inside them, so the button get's placed beside the
-          ;; "Comments" header when you hide them.
-          (insert "         ")))
-      ;; If there are no comments, we have to add this margin here.
-      (unless .comments
-        (insert "         "))
-      (insert "               ")
-      ;; This is where the "add a comment" button is printed.
-      (insert-text-button "Add a Comment"
-                          :type 'sx-button-comment)
-      (insert "\n"))))
+              '(sx-question-mode--section-content t)
+            (insert "\n")
+            (sx--wrap-in-overlay
+                '(face sx-question-mode-content-face)
+              (mapc #'sx-question-mode--print-comment .comments))
+            ;; If there are comments, we want part of this margin to go
+            ;; inside them, so the button get's placed beside the
+            ;; "Comments" header when you hide them.
+            (insert "         ")))
+        ;; If there are no comments, we have to add this margin here.
+        (unless .comments
+          (insert "         "))
+        (insert "               ")
+        ;; This is where the "add a comment" button is printed.
+        (insert-text-button "Add a Comment"
+                            :type 'sx-button-comment)
+        (insert "\n")))))
 
 (defun sx-question-mode--propertize-display-name (author)
   "Return display_name of AUTHOR with `sx-question-mode-author' face."