Don't stall due to dynamic source location discovery on long lines in repl #2532
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
bbatsov
reviewed
Dec 21, 2018
| cider-locref-regexp-alist)) | ||
| (save-excursion | ||
| (goto-char (or pos (point))) | ||
| (when (< (- (point-at-eol) (point-at-bol)) 300) |
There was a problem hiding this comment.
Probably we should explain that magic number. Or maybe make it a variable.
|
Apart from the failing build and my small remark, the changes look good. |
bbatsov
reviewed
Dec 21, 2018
test/cider-repl-tests.el
Outdated
| (with-temp-buffer | ||
| (insert "\nReflection warning, cider/nrepl/middleware/slurp.clj:103:16 - reference to field getInputStream can't be resolved.") | ||
| (move-to-column 20) | ||
| (expect (cider-locref-at-point) | ||
| :to-equal | ||
| '(:type reflection :highlight (22 . 61) :var nil :file "cider/nrepl/middleware/slurp.clj" :line 103))))) | ||
| '(:type warning :highlight (22 . 61) :var nil :file "cider/nrepl/middleware/slurp.clj" :line 103)))) | ||
| (it "works with warnings" |
There was a problem hiding this comment.
I see you've got two blocks with the same description - an oversight maybe?
|
@vspinu ping :-) |
|
Sorry. I got detached for a while and didn't notice your comments. Both issues fixed. I think adding a variable for line length is an overkill. I would think that paths longer than 300 characters are very unlikely. I have added a comprehensive comment. |
|
Thanks! |
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.
I am observing long hangs when I am hovering on long lines in repl. While the root cause is somewhere down in emacs redisplay or regexp lookup, the cause on the CIDER side is in the dynamic source location sniffing.
In this PR I am disallowing source loc discovery on lines longer than 300 characters (should be more than enough) and improving source locs regexp.