Indent lines after hanging operator even if previous line contains # #115
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
These are changes unrelated to JuliaEditorSupport#15 that just make the code a bit more readable. This commit should be reviewed separately. Since the julia group was declared with a :prefix of julia- all of these customization variables will be in the julia group anyway. Also, since julia-mode didn't declare it's group, an anonymous julia-mode group was getting created for faces.
Because the previous implementation used a regex to detect whether the hanging operator was in a comment or not, it did not detect hanging operators following a # in a string. Fixes JuliaEditorSupport#19
|
@giordano or @FelipeLema could you please review this when you get a chance? Or @rfourquet if you're feeling up to it? |
FelipeLema
reviewed
Jul 14, 2020
FelipeLema
reviewed
Jul 14, 2020
FelipeLema
approved these changes
Jul 14, 2020
rfourquet
approved these changes
Jul 15, 2020
| @@ -388,7 +389,7 @@ symbol, gives up when this is not true." | |||
| (while (and (not done) (< (point-min) (point))) | |||
| (julia-safe-backward-sexp) | |||
| (cond | |||
| ((looking-at (rx (or "import" "export" "using"))) | |||
| ((looking-at (regexp-opt (list "import" "export" "using"))) | |||
There was a problem hiding this comment.
Why prefering regexp-opt to rx?
There was a problem hiding this comment.
If I remember correctly regexp-opt is more efficient if it is applicable.
There was a problem hiding this comment.
That was my justification, but actually trying the functions, they generate the same regex strings in this case. I can revert if desired.
There was a problem hiding this comment.
No need, it is perfect as is.
tpapp
approved these changes
Jul 15, 2020
| @@ -388,7 +389,7 @@ symbol, gives up when this is not true." | |||
| (while (and (not done) (< (point-min) (point))) | |||
| (julia-safe-backward-sexp) | |||
| (cond | |||
| ((looking-at (rx (or "import" "export" "using"))) | |||
| ((looking-at (regexp-opt (list "import" "export" "using"))) | |||
There was a problem hiding this comment.
If I remember correctly regexp-opt is more efficient if it is applicable.
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.
Because the previous implementation used a regex to detect whether the
hanging operator was in a comment or not, it did not detect hanging
operators following a # in a string.
Fixes #19
This also fixes an unrelated issue where the following didn't get properly indented. Haven't dug in to see what the underlying problem was. That's why the unrelated test had to be changed; the regex no longer applied since the buffer was getting properly indented.