From fad432dc00b7ba1103041b9fd87d4adcf4ac7fd1 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Sun, 6 Mar 2011 16:28:08 -0800 Subject: [PATCH] hideshow.el: corrected improper handling of braces in comments. Previous fix in bug #8036 would stop searching for a block start as soon as one was encountered in a comment. This patch keeps searching, until a non-commented block start is found. Furthermore, this patch resolves some corner cases by wrapping all searches for hs-block-start-regexp into a function that also checks for comments --- lisp/progmodes/hideshow.el | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 9468d7b..708a0b4 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -536,6 +536,13 @@ property of an overlay." (overlay-put ov 'display nil)))) (overlay-put ov 'invisible (and hide-p 'hs))) +(defun hs-looking-at-block-start-p () + "Returns non-nil if the point is at the block start. +A function is useful for this to cleanly disregard commented-out +blocks" + (and (looking-at hs-block-start-regexp) + (save-match-data (not (nth 4 (syntax-ppss)))))) + (defun hs-forward-sexp (match-data arg) "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG. Original match data is restored upon return." @@ -564,7 +571,7 @@ The block beginning is adjusted by `hs-adjust-block-beginning' and then further adjusted to be at the end of the line." (if comment-reg (hs-hide-comment-region (car comment-reg) (cadr comment-reg) end) - (when (looking-at hs-block-start-regexp) + (when (hs-looking-at-block-start-p) (let* ((mdata (match-data t)) (header-beg (match-beginning 0)) (header-end (match-end 0)) @@ -685,16 +692,15 @@ Return point, or nil if original point was not in a block." (let ((done nil) (here (point))) ;; look if current line is block start - (if (looking-at hs-block-start-regexp) + (if (hs-looking-at-block-start-p) (point) ;; look backward for the start of a block that contains the cursor (while (and (re-search-backward hs-block-start-regexp nil t) - (save-match-data - (not (nth 4 (syntax-ppss)))) ; not inside comments - (not (setq done + (or (save-match-data (nth 4 (syntax-ppss))) ; go again if in a comment + (not (setq done (< here (save-excursion (hs-forward-sexp (match-data t) 1) - (point))))))) + (point)))))))) (if done (point) (goto-char here) @@ -751,7 +757,7 @@ and `case-fold-search' are both t." (end-of-line) (when (and (not c-reg) (hs-find-block-beginning) - (looking-at hs-block-start-regexp)) + (hs-looking-at-block-start-p)) ;; point is inside a block (goto-char (match-end 0))))) (end-of-line) @@ -836,7 +842,7 @@ Upon completion, point is repositioned and the normal hook (<= (count-lines (car c-reg) (nth 1 c-reg)) 1))) (message "(not enough comment lines to hide)")) ((or c-reg - (looking-at hs-block-start-regexp) + (hs-looking-at-block-start-p) (hs-find-block-beginning)) (hs-hide-block-at-point end c-reg) (run-hooks 'hs-hide-hook)))))) @@ -868,7 +874,7 @@ See documentation for functions `hs-hide-block' and `run-hooks'." q (cadr c-reg)))) ((and (hs-find-block-beginning) ;; ugh, fresh match-data - (looking-at hs-block-start-regexp)) + (hs-looking-at-block-start-p)) (setq p (point) q (progn (hs-forward-sexp (match-data t) 1) (point))))) (when (and p q) -- 1.7.4.1