vim: Fix an indentation issue with cindent #14056
Closed
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
cindent handles the following case incorrectly:
impl X {
b: int,
//
c: int,
}
if you try and insert a new line after the `c` declaration.
To fix this, fix the get_line_trimmed() function to work properly, and
then extend GetRustIndent to keep searching backwards until it finds a
non-blank line after trimming. This lets it handle the trailing comma
case properly, as if the comment were never there.
Fixes rust-lang#14041.
| @@ -40,12 +40,12 @@ function! s:get_line_trimmed(lnum) | |||
| " If the last character in the line is a comment, do a binary search for | |||
| " the start of the comment. synID() is slow, a linear search would take | |||
| " too long on a long line. | |||
| if synIDattr(synID(a:lnum, line_len, 1), "name") =~ "Comment\|Todo" | |||
| if synIDattr(synID(a:lnum, line_len, 1), "name") =~ 'Comment\|Todo' | |||
There was a problem hiding this comment.
Good catch—that was stupid of me.
|
Nicely done! LGTM. |
bors
added a commit
that referenced
this pull request
May 10, 2014
cindent handles the following case incorrectly:
impl X {
b: int,
//
c: int,
}
if you try and insert a new line after the `c` declaration.
To fix this, fix the get_line_trimmed() function to work properly, and
then extend GetRustIndent to keep searching backwards until it finds a
non-blank line after trimming. This lets it handle the trailing comma
case properly, as if the comment were never there.
Fixes #14041.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 13, 2023
Parse macros `allow_internal_unsafe` attribute We don't use it for anything yet but it might become part of hygiene
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.
cindent handles the following case incorrectly:
if you try and insert a new line after the
cdeclaration.To fix this, fix the get_line_trimmed() function to work properly, and
then extend GetRustIndent to keep searching backwards until it finds a
non-blank line after trimming. This lets it handle the trailing comma
case properly, as if the comment were never there.
Fixes #14041.