Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vim: Tweak how comment nesting works
Don't try to match line comments inside of a comment block. That makes no sense and can highlight differently for people who override their highlights. Similarly, don't match a doc-comment inside of a comment block. It shouldn't be highlighted differently unless it's actually a doc-comment (and nested comments are obviously not doc comments). Fixes #12307.
- Loading branch information
bc35eb7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at lilyball@bc35eb7
bc35eb7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging kballard/rust/vim-nested-comments = bc35eb7 into auto
bc35eb7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kballard/rust/vim-nested-comments = bc35eb7 merged ok, testing candidate = b349fee
bc35eb7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4556
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/2398
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/2399
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4554
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3654
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3660
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4569
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3657
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3663
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4571
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3657
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3662
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3731
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1549
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4564
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3665
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3672
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4330
bc35eb7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = b349fee