Fix slow angle bracket matching #89
Merged
Conversation
This file contains hidden or 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
The problem was caused by the logic that made it refontify the whole buffer when "font-lock-syntactically-fontified" was set to a position before the start of the region to be potentially fontified. Unfortunately that variable is not reliably set when fontifying a large buffer. Fortunately, the new logic is much simpler, and font-lock already takes care of ensuring that everything before font-lock-beg was syntactically fontified. The other problem was calling syntax-ppss on positions known not to be fontified yet. This fixes both of these issues, and the angle bracket matching now works on larger buffers without pausing on every keystroke.
Recognize raw strings all the way to the end of the buffer if they are not closed. This is not valid rust code, but the highlighting should show the mistake. This also eliminates glitchy behavior that can occur in this situation. Emacs assumes that edits can't change syntax at positions before the edit, and raw strings without this change violated this.
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
nikomatsakis
added a commit
that referenced
this pull request
Jul 31, 2015
Fix slow angle bracket matching
|
Looked pretty reasonable to me. Thanks @MicahChalmer for looking into this! ps, I'm always happy when I hit tab and things line up with the opening |
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.
Fix #86.
The problem was caused by the logic that made it refontify the whole buffer when "font-lock-syntactically-fontified" was set to a position before the start of the region to be potentially fontified. Unfortunately that variable is not reliably set when fontifying a large buffer. Fortunately, the new logic is much simpler, and font-lock already takes care of ensuring that everything before font-lock-beg was syntactically fontified.
The other problem was calling syntax-ppss on positions known not to be fontified yet.
This fixes both of these issues, and the angle bracket matching now works on larger buffers without pausing on every keystroke.
Also included is a patch that makes it recognize incomplete raw strings. Without this, changing a character can affect syntax before it, and font-lock can be glitchy if that happens.