diff --git a/adoc-mode.el b/adoc-mode.el index 4d114bf..1ea3106 100644 --- a/adoc-mode.el +++ b/adoc-mode.el @@ -1556,6 +1556,21 @@ Subgroups of returned regexp: ;;;; font lock keywords +(defsubst adoc-kwf-search (regexp &optional bound noerror count) + "Keyword search for Adoc. +Like `re-search-forward' with the same arguments +REGEXP, BOUND, NOERROR and COUNT. +If a match for REGEXP is found where the text property +`adoc-code-block' is non-nil continue the search. +This speeds up the search and avoids the application of +adoc-syntax to code blocks." + (let (ret) + (while (and + (setq ret (re-search-forward regexp bound noerror count)) + (get-text-property (point) 'adoc-code-block) + (null (eobp)))) + ret)) + (defun adoc-kwf-std (end regexp &optional must-free-groups no-block-del-groups) "Standard function for keywords Intendent to be called from font lock keyword functions. END is @@ -1564,10 +1579,9 @@ MUST-FREE-GROUPS a list of regexp group numbers which may not match text that has an adoc-reserved text-property with a non-nil value. Likewise, groups in NO-BLOCK-DEL-GROUPS may not contain text having adoc-reserved set to symbol `block-del'." - (let ((found t) (prevented t) saved-point) + (let ((found t) (prevented t)) (while (and found prevented (<= (point) end) (not (eobp))) - (setq saved-point (point)) - (setq found (re-search-forward regexp end t)) + (setq found (adoc-kwf-search regexp end t)) (setq prevented (and found (or @@ -1584,7 +1598,7 @@ text having adoc-reserved set to symbol `block-del'." 'adoc-reserved 'block-del))) no-block-del-groups)))) (when (and found prevented (<= (point) end)) - (goto-char (1+ saved-point)))) + (goto-char (1+ (match-beginning 0))))) (and found (not prevented)))) (defun adoc-kwf-attribute-list (end) @@ -1679,7 +1693,7 @@ text having adoc-reserved set to symbol `block-del'." ;; matcher function `(lambda (end) (and adoc-enable-two-line-title - (re-search-forward ,(adoc-re-two-line-title del) end t) + (adoc-kwf-search ,(adoc-re-two-line-title del) end t) (< (abs (- (length (match-string 2)) (length (match-string 3)))) 3) (or (not (numberp adoc-enable-two-line-title)) (not (equal adoc-enable-two-line-title (length (match-string 2))))) @@ -1754,7 +1768,7 @@ Concerning TYPE, LEVEL and SUB-TYPE see `adoc-re-llisti'." `(list ;; matcher function (lambda (end) - (and (re-search-forward "^[ \t]*\\(\\(?:CAUTION\\|WARNING\\|IMPORTANT\\|TIP\\|NOTE\\):\\)\\([ \t]+\\)" end t) + (and (adoc-kwf-search "^[ \t]*\\(\\(?:CAUTION\\|WARNING\\|IMPORTANT\\|TIP\\|NOTE\\):\\)\\([ \t]+\\)" end t) (not (text-property-not-all (match-beginning 0) (match-end 0) 'adoc-reserved nil)))) ;; highlighers '(1 '(face adoc-complex-replacement-face adoc-reserved t)) @@ -1765,7 +1779,7 @@ Concerning TYPE, LEVEL and SUB-TYPE see `adoc-re-llisti'." (list ;; matcher function `(lambda (end) - (and (re-search-forward ,(adoc-re-verbatim-paragraph-sequence) end t) + (and (adoc-kwf-search ,(adoc-re-verbatim-paragraph-sequence) end t) (not (text-property-not-all (match-beginning 0) (match-end 0) 'adoc-reserved nil)))) ;; highlighers '(1 '(face adoc-typewriter-face adoc-reserved t font-lock-multiline t)))) @@ -1889,18 +1903,11 @@ meta characters." `(list ;; matcher function (lambda (end) - (let ((found t) (prevented t) saved-point) - (while (and found prevented) - (setq saved-point (point)) - (setq found - (re-search-forward ,regexp end t)) - (setq prevented ; prevented is only meaningful wenn found is non-nil - (or - (not found) ; the following is only needed when found - (text-property-not-all (match-beginning 1) (match-end 1) 'adoc-reserved nil))) - (when (and found prevented) - (goto-char (+ saved-point 1)))) - (when (and found (not prevented) adoc-insert-replacement ,replacement) + (let (found) + (while (and (setq found (adoc-kwf-search ,regexp end t)) + (text-property-not-all (match-beginning 1) (match-end 1) 'adoc-reserved nil)) + (goto-char (+ (match-beginning 0) 1))) + (when (and found adoc-insert-replacement ,replacement) (let* ((s (cond ((stringp ,replacement) ,replacement) @@ -1912,7 +1919,7 @@ meta characters." (setq adoc-replacement-failed (not o)) (unless adoc-replacement-failed (overlay-put o 'after-string s)))) - (and found (not prevented)))) + found)) ;; highlighers ;; TODO: replacement instead warining face if resolver is not given @@ -1931,7 +1938,7 @@ meta characters." ;; line beginning would also be underlined, which looks akward. (defun adoc-flf-first-whites-fixed-width(end) ;; it makes no sense to do something with a blank line, so require at least one non blank char. - (and (re-search-forward "\\(^[ \t]+\\)[^ \t\n]" end t) + (and (adoc-kwf-search "\\(^[ \t]+\\)[^ \t\n]" end t) ;; don't replace a face with with adoc-align-face which already is a fixed with ;; font (most probably), because then it also won't look aligned (text-property-not-all (match-beginning 1) (match-end 1) 'face 'adoc-typewriter-face) @@ -2120,7 +2127,7 @@ Use this function as matching function MATCHER in `font-lock-keywords'." (font-lock-append-text-property start-src end-src+nl 'face 'adoc-native-code-face) (add-text-properties - start-src end-src+nl '(font-lock-fontified t font-lock-multiline t)) + start-src end-src+nl '(font-lock-fontified t font-lock-multiline t adoc-code-block t)) ))) t))) @@ -2154,9 +2161,7 @@ Use this function as matching function MATCHER in `font-lock-keywords'." (defun adoc-get-font-lock-keywords () "Return list of keywords for `adoc-mode'." (list - ;; Fontify code blocks first to mark these regions as fontified. - '(adoc-fontify-code-blocks) - + '(adoc-fontify-code-blocks) ; listing ;; Asciidoc BUG: Lex.next has a different order than the following extract ;; from the documentation states. diff --git a/test/adoc-mode-test.el b/test/adoc-mode-test.el index c6b1d3e..d20ced6 100644 --- a/test/adoc-mode-test.el +++ b/test/adoc-mode-test.el @@ -1026,6 +1026,23 @@ Don't use it for anything real.") (cons "sub chapter 2.1" 262))))) (kill-buffer "adoc-test"))) +(ert-deftest adoctest-adoc-kw-replacement () + (unwind-protect + (progn + (set-buffer (get-buffer-create "adoc-test")) + (erase-buffer) + (adoc-mode) + (let ((adoc-insert-replacement t)) + (adoc-calc) + (insert "(C)") + (font-lock-flush) + (font-lock-ensure) + (should (string-equal (overlay-get (car (overlays-in (point) (point-max))) 'after-string) "©")) + ) + ) + (adoc-calc) + (kill-buffer "adoc-test"))) + ;; purpose ;; - ensure that the latest version, i.e. the one currently in buffer(s), of ;; adoc-mode and adoc-mode-test is used for the test