Fix comment bounds detection at bobp

Fuco1 · Jul 4, 2017 · cb8d03a · cb8d03a
1 parent f5ffbc7
commit cb8d03a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/smartparens.el b/smartparens.el
@@ -4168,7 +4168,8 @@ If the point is not inside a quoted string, return nil."
                                       (end-of-line))
                                     t))))
                   ;; this means we got here by `sp-point-in-comment' condition
-                  (forward-char)
+                  (unless (and (bobp) (sp-point-in-comment))
+                    (forward-char))
                   (point)))
           (close (save-excursion
                    (while (and (not (eobp))

diff --git a/test/smartparens-get-comment-bounds-test.el b/test/smartparens-get-comment-bounds-test.el
@@ -43,6 +43,10 @@
 (bar)"
    (should (equal (sp-get-comment-bounds) '(11 . 40)))))
 
+(ert-deftest sp-test-get-comment-bounds-elisp-with-comment-starting-at-bobp ()
+  (sp-test-with-temp-elisp-buffer ";; |foobar"
+    (should (equal (sp-get-comment-bounds) '(1 . 10)))))
+
 (ert-deftest sp-test-get-comment-bounds-pascal ()
   (sp-test-with-temp-buffer
       "var foo:integer; (* foo|bar *)"
@@ -56,3 +60,10 @@
         (pascal-mode)
         (save-excursion (syntax-ppss 1)))
     (should (equal (sp-get-comment-bounds) '(18 . 28)))))
+
+(ert-deftest sp-test-get-comment-bounds-pascal-with-comment-starting-at-bobp ()
+  (sp-test-with-temp-buffer "(* foo|bar *)"
+      (progn
+        (pascal-mode)
+        (save-excursion (syntax-ppss 1)))
+    (should (equal (sp-get-comment-bounds) '(1 . 13)))))