Cache embedding regexes #730
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexmaco
force-pushed
the
fast
branch
5 times, most recently
from
85aaf90
to
f30d0a1
Compare
|
Thank you for your PR! I will try to review this sometime soon. |
…alisys and streamline body
…til quoting issues are resolved
|
Thank you for your PR! I think there's a small amount of cleanup that might be needed in the new module, but I'm still going to merge this, and we can iterate further with future PRs. |
kornysietsma
pushed a commit
to kornysietsma/tokei
that referenced
this pull request
Nov 16, 2022
* Run cargo fmt and apply clippy lints from rust 1.51.0 * Rename can_perform_single_line_analisys to try_perform_single_line_analisys and streamline body * Remove ops::Add impl for CodeStats; only AddAssign is meaningful and used * Add embedding module to cache heuristic regexes used to detect embedded languages * Add separate embedding tests; Not all cases can be execised with a single test * Simplify html embedding test file_triggeringprincipal_frame_1.html until quoting issues are resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #616
This runs the embedding regexes once per line, and caches their results. The state machine then only tries to look up results by the index.
This also adds a test suite dedicated to embedding, containing only one test file, lifted from the firefox 85 codebase. This is done since adjusting the existing html test to reproduce some problems seemed more complicated.
As a side effect of these changes, counting has become more accurate around embedding (e.g. tokei preciously did not detect javascript at all in the included embedding test), so the precise behavior is expected to differ from the current master.
There are a few more miscounting issues lurking in there, but they seem to be preexisting. Eventually the last commit that simplifies the embedding test should be reverted.