Skip to content

Textmate grammar: prevent line comments from breaking block comments (closes #6281) - #6320

Merged
bors[bot] merged 1 commit into
rust-lang:masterfrom
dustypomerleau:comments
Oct 22, 2020
Merged

Textmate grammar: prevent line comments from breaking block comments (closes #6281)#6320
bors[bot] merged 1 commit into
rust-lang:masterfrom
dustypomerleau:comments

Conversation

@dustypomerleau

Copy link
Copy Markdown
Contributor

Fixes #6281.

Previously, line comments were able to break block comments by essentially commenting out the closing */, resulting in a never-ending comment. This PR splits block comments into a separate repository group to fix this problem.

Since the comment scopes also include ignored parameters and inferred types, I've added the change proposed by @bnjjj in #6317, in order to close #6311 as well.

- prevent line comments inside block comments
- prevent underscore-prefixed functions and macros from receiving comment scope
@matklad

matklad commented Oct 22, 2020

Copy link
Copy Markdown
Contributor

bors r+

@bors

bors Bot commented Oct 22, 2020

Copy link
Copy Markdown
Contributor

@bors
bors Bot merged commit ab53bb8 into rust-lang:master Oct 22, 2020
@dustypomerleau
dustypomerleau deleted the comments branch November 2, 2020 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants