diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-22 13:04:50 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-22 13:04:50 +0100 |
| commit | ab53bb8718bb93b72085c19337f7e766ea7196f6 (patch) | |
| tree | 08960deae32826de2add8fa1746f21a9f735f3fe /crates/proc_macro_srv/src/proc_macro/diagnostic.rs | |
| parent | af75a081169afbd63b3349611e95418f980be32f (diff) | |
| parent | 26b4b1e2fb06f54e2974835077c2e970b2e0f2b8 (diff) | |
| parent | 68c67efa683bd676096c3a28960f806d4d3dc5d7 (diff) | |
Merge #6320 #6321
6320: Textmate grammar: prevent line comments from breaking block comments (closes #6281) r=matklad a=dustypomerleau
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/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 https://github.com/rust-analyzer/rust-analyzer/pull/6317, in order to close https://github.com/rust-analyzer/rust-analyzer/issues/6311 as well.
6321: Fix opening module documentation opening parent documentation instead r=matklad a=zacps
The whole path/URL joining code is kind of ugly which is what led to
this, but at the same time I don't really want to rewrite it right
now...
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6286
Co-authored-by: Dusty Pomerleau <[email protected]>
Co-authored-by: Zac Pullar-Strecker <[email protected]>