Don’t stop at empty lines in ‘end-of-defun’#75
Open
dvdhansen wants to merge 1 commit intoJuliaEditorSupport:masterfrom
Open
Don’t stop at empty lines in ‘end-of-defun’#75dvdhansen wants to merge 1 commit intoJuliaEditorSupport:masterfrom
dvdhansen wants to merge 1 commit intoJuliaEditorSupport:masterfrom
Conversation
nverno
reviewed
May 29, 2019
| (or (julia-syntax-comment-or-string-p) | ||
| (> (current-indentation) beg-defun-indent))))) | ||
| (> (current-indentation) beg-defun-indent) | ||
| (looking-at-p "^\\s-*\\(?:#.*\\)*$"))))) |
Contributor
There was a problem hiding this comment.
should this just use forward-comment?
Author
There was a problem hiding this comment.
We also need to move over empty lines including those with “only but
not enough” whitespaces. forward-comment won’t do the job.
Replacing looking-at-p with (forward-comment 1) will move the
cursor to the line with the return statement and return nil.
function f()
x = 42
return x
end
Contributor
There was a problem hiding this comment.
There is a bug in cases like
f(x)::Int8 =
# no comment
x*x
function forty_two()
# no comment
return 42
end
where end-of-defun jumps from first to end of second. It also gets stuck when point is just prior to the first function.
Contributor
There was a problem hiding this comment.
For forward-comment I had been thinking along the lines of
(while (and (not (eobp))
(forward-line 1)
(or (forward-comment 5)
(julia-syntax-comment-or-string-p)
(> (current-indentation) beg-defun-indent)))))
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
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.
No description provided.