Handle return in ordered lists context #326
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
mitya57
requested changes
Sep 21, 2017
ReText/editor.py
Outdated
| # Reset the cursor | ||
| cursor = self.textCursor() | ||
| cursor.insertText(('\n' + text[:pos]) if pos < length else '\n') | ||
| match = re.search("^[\\s]*([*>-]|\\d+\\.) ", text) |
There was a problem hiding this comment.
Please pre-compile the regexes for performance using re.compile.
ReText/editor.py
Outdated
| if len(matchedText) == length: | ||
| cursor.removeSelectedText() | ||
| matchedText = '' | ||
| else : |
There was a problem hiding this comment.
Please remove spaces after else.
xgouchet
force-pushed
the
handle_ordered_lists
branch
from
4dc8677 to
c2fd36d
Compare
mitya57
requested changes
Sep 21, 2017
ReText/editor.py
Outdated
| if len(matchedText) == length: | ||
| cursor.removeSelectedText() | ||
| matchedText = '' | ||
| else : |
ReText/editor.py
Outdated
| @@ -105,6 +105,8 @@ def __init__(self, parent): | |||
| self.infoArea = LineInfoArea(self) | |||
| self.statistics = (0, 0, 0) | |||
| self.statsArea = TextInfoArea(self) | |||
| self.returnBlockPattern = re.compile("^[\\s]*([*>-]|\\d+\\.) ") | |||
| self.orderedListPattern = re.compile("^([\\s]*)(\\d+)\\. $") | |||
There was a problem hiding this comment.
I would move it to class level (below the scrollLimitReached = pyqtSignal(QWheelEvent) line) for even more performance :)
This allows to continue an ordered list by pressing return, the same way unordered lists and quote blocks are handled. I changed the detection to use a regex that might ease other supports
xgouchet
force-pushed
the
handle_ordered_lists
branch
from
c2fd36d to
9ea6ca8
Compare
|
Merged. Thanks a lot! |
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.
This allows to continue an ordered list by pressing return, the same way
unordered lists and quote blocks are handled.
I changed the detection to use a regex that might ease other supports