Src block/33font lock fontified missing #37
Conversation
- Set text property `font-lock-fontified` for fontified code blocks - also fix compiler error by quoting lambdas with sharp quote
Replace `re-search-forward` by `adoc-kwf-search` in font-lock keywords. `adoc-kwf-search` continues search if the adoc-code-block text property is set at the matching position.
Also add ert test for keyword-replacement
adoc-mode.el
Outdated
| 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." |
There was a problem hiding this comment.
Probably you should also mention explicitly that the purpose of this is skip code in code blocks for performance reasons.
There was a problem hiding this comment.
Not only for performance reasons but also to prevent the adoc fontification within code blocks.
There was a problem hiding this comment.
Well, this should be mentioned in the docstring as well then.
| @@ -1556,6 +1556,19 @@ Subgroups of returned regexp: | |||
|
|
|||
|
|
|||
| ;;;; font lock keywords | |||
| (defsubst adoc-kwf-search (regexp &optional bound noerror count) | |||
There was a problem hiding this comment.
Because adoc-kwf-search does not return a font-lock keyword but it is an auxiliary Function much like adoc-kwf-std.
There was a problem hiding this comment.
I get this, but I'm struggling to understand what does kwf stands for. :-)
There was a problem hiding this comment.
I assume that -kwf- stands for keyword function.
Those are functions that are used in the keyword generators -kw-.
There was a problem hiding this comment.
Well, here it's not even a function, as I see it's being inlined. :-) Anyways, I don't feel strongly about this naming - I just find it somewhat confusing.
There was a problem hiding this comment.
Reasoning for the naming:
- Keep changes small
- Keep consistency
|
One final comment - I find it weird that the first commit is marked as fixing #33 and all commits afterwards are marked as addressing it. I'd suggested that the main fix be marked with |
Side-note: The "Addresses"/"Fixes"-Style is adopted from a project with about 10k C++-source/header-files. It contains many more files in other programming languages. The But, I am adopting to your suggested style. Let's hope that I do remember and take care in the comments for the next pull-request. |
adoc-kwf-searchthat skips code blocksadoc-kwf-std, re-start search at the match string -- not at last start + 1 (this speeds up font-locking)adoc-kw-replacementsuch that it has the same speed-up asadoc-kwf-stdand the code for the search operation is simplifiedadoc-kw-replacement