Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fall back to general fontification of source blocks if lang attr is n… #55

Merged
merged 2 commits into from
Feb 18, 2024
Merged

Fall back to general fontification of source blocks if lang attr is n… #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba334ab
Fall back to general fontification of source blocks if lang attr is n…
Feb 12, 2024
c307889
Add test case for source blocks without language attribute
Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions adoc-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2066,12 +2066,6 @@ START-SRC and END-SRC delimit the actual source code."
(put-text-property
(+ start-src (1- pos)) (1- (+ start-src next)) 'face
val adoc-buffer))))
(add-text-properties start-block start-src '(face adoc-meta-face))
(add-text-properties end-src end-block '(face adoc-meta-face))
(add-text-properties
start-block end-block
'(font-lock-fontified t fontified t font-lock-multiline t
adoc-code-block t adoc-reserved t))
(set-buffer-modified-p modified)))))

(defconst adoc-code-block-begin-regexp
Expand Down Expand Up @@ -2109,9 +2103,10 @@ Group 2 contains the block delimiter.")
"Search for next adoc-code block up to LAST.
NOERROR is the same as for `search-forward'.

Return the source block language and
Return a string with the source block language and
set match data if a source block is found.
Otherwise return nil.
If the source block is given without the language attribute return t.
If no source block is found return nil.

The overall match data begins at the
header of the code block and ends at the end of the
Expand Down Expand Up @@ -2167,19 +2162,22 @@ Use this function as matching function MATCHER in `font-lock-keywords'."
(end-src (match-end 1))
(end-src+nl (if (eq (char-after end-src) ?\n) (1+ end-src) end-src))
(size (1+ (- end-src start-src))))
(if (if (numberp adoc-fontify-code-blocks-natively)
(<= size adoc-fontify-code-blocks-natively)
adoc-fontify-code-blocks-natively)
(adoc-fontify-code-block-natively lang start-block end-block start-src end-src)
(add-text-properties
start-src
end-src
'(font-lock-face adoc-verbatim-face)))
;; Set background for block as well as opening and closing lines.
(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 adoc-code-block t))
(if (and
(stringp lang)
(if (numberp adoc-fontify-code-blocks-natively)
(<= size adoc-fontify-code-blocks-natively)
adoc-fontify-code-blocks-natively))
(progn
(adoc-fontify-code-block-natively lang start-block end-block start-src end-src)
(font-lock-append-text-property start-src end-src 'face 'adoc-native-code-face)
(add-text-properties end-src end-src+nl '(face adoc-native-code-face)))
;; code block without language attribute or too large
(add-text-properties start-src end-src '(face (adoc-verbatim-face adoc-code-face)))
(add-text-properties end-src end-src+nl '(face adoc-code-face)))
(add-text-properties start-block start-src '(face adoc-meta-face))
(put-text-property end-src+nl end-block 'face adoc-meta-face)
(add-text-properties start-src end-src+nl '(adoc-code-block t))
(add-text-properties start-block end-block '(font-lock-fontified t font-lock-multiline t adoc-reserved t))
)))
t)))

Expand Down
14 changes: 10 additions & 4 deletions test/adoc-mode-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,26 +349,32 @@ Don't use it for anything real.")
"\n" nil
"[source,adoctest-lang]\n----\n" 'adoc-meta-face
source-code
"\n" '(adoc-meta-face adoc-native-code-face)
"\n" 'adoc-native-code-face
"----" 'adoc-meta-face
"\n" nil
;; Code blocks without language attribute
"[source]\n----\n" 'adoc-meta-face
(apply #'concat (cl-loop for str in source-code by #'cddr collect str)) '(adoc-verbatim-face adoc-code-face)
"\n" 'adoc-code-face
"----" 'adoc-meta-face
"\n" nil
;; Code block as OPEN BLOCK
"\n" nil
"[source,adoctest-lang]\n--\n" 'adoc-meta-face
source-code
"\n" '(adoc-meta-face adoc-native-code-face)
"\n" 'adoc-native-code-face
"--" 'adoc-meta-face
"\n" nil
;; Code block as Literal block
"[source,adoctest-lang]\n....\n" 'adoc-meta-face
source-code
"\n" '(adoc-meta-face adoc-native-code-face)
"\n" 'adoc-native-code-face
"...." 'adoc-meta-face
"\n" nil
;; Test ignored spaces
"[source,\t adoctest-lang]\t \n....\n" 'adoc-meta-face
source-code
"\n" '(adoc-meta-face adoc-native-code-face)
"\n" 'adoc-native-code-face
"...." 'adoc-meta-face
"\n" nil
))))
Expand Down
Loading