Prevent word wrapping lines which will be truncated later #153
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
|
Ah, I think we duplicated work, sorry! My patch is pretty small, so I'm fine with dropping it, I'll read the comments you made and your patch in a bit. |
jgkamat
commented
Oct 25, 2017
| @@ -260,18 +260,26 @@ Each function takes two arguments: | |||
| (let* ((label-string (format fmt "Preview:")) | |||
| (label-len (length label-string)) | |||
| (prefix (make-string label-len ?\ )) | |||
| (max-lines 4) | |||
| did-cut) | |||
There was a problem hiding this comment.
Self-reviewing, did-cut is not updated, so that can cause ... to not be inserted when it should be.
|
#152 (comment) is better, so closing this. |
vermiculus
added a commit
that referenced
this pull request
Oct 27, 2017
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.
See #152.
This is the first thing I noticed (the most obvious fix), but it's far from the biggest improvement. I tried taking a look at the bigger issue, but I dove really deep into macros so that might take some more time. I'm suspecting a 'catch' in a magit macro, but that's going to take a longer time to deal with.
This change reduces my
magit-statusonqutebrowser/qutebrowserfrom 4 seconds to 3, so not a huge improvement, but it is measurable. There is one possible regression in this, though.Previously, the trim would always trim at 4 lines, regardless of input. Now, there is an edge case where if any of the first few lines is long:
The line will be truncated early. Do you think that's acceptible? I don't think it makes too much of a difference, and all the other cases should be the same.
Also, I'm assuming this should go on
develop, let me know if that's not the case (it dosen't conflict when cherry picking it to master).