Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-21 15:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2350

Browse source 
2350: Don't continue line comments r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-11-22 07:40:42 +00:00 committed by GitHub
commit d25ae6bb16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/ra_ide_api/src/typing.rs
View file

@ -40,9 +40,13 @@ pub(crate) fn on_enter(db: &RootDatabase, position: FilePosition) -> Option<Sour
}
let prefix = comment.prefix();
if position.offset
< comment.syntax().text_range().start() + TextUnit::of_str(prefix) + TextUnit::from(1)
{
let comment_range = comment.syntax().text_range();
if position.offset < comment_range.start() + TextUnit::of_str(prefix) + TextUnit::from(1) {
return None;
}
// Continuing non-doc line comments (like this one :) ) is annoying
if prefix == "//" && comment_range.end() == position.offset {
return None;
}
@ -247,6 +251,30 @@ impl S {
}
",
);
do_check(
r"
fn main() {
// Fix<|> me
let x = 1 + 1;
}
",
r"
fn main() {
// Fix
// <|> me
let x = 1 + 1;
}
",
);
do_check_noop(
r"
fn main() {
// Fix me<|>
let x = 1 + 1;
}
",
);
do_check_noop(r"<|>//! docz");
}