3e7e3fdf16
When multiple traits bounds are present, expanded selection from a single trait bound will include the nearest plus sign (and whitespace after) before including the whole trait bound.
453 lines
13 KiB
Rust
453 lines
13 KiB
Rust
//! FIXME: write short doc here
|
|
|
|
use ra_db::SourceDatabase;
|
|
use ra_syntax::{
|
|
algo::find_covering_element,
|
|
ast::{self, AstNode, AstToken},
|
|
Direction, NodeOrToken,
|
|
SyntaxKind::{self, *},
|
|
SyntaxNode, SyntaxToken, TextRange, TextUnit, TokenAtOffset, T,
|
|
};
|
|
|
|
use crate::{db::RootDatabase, FileRange};
|
|
|
|
// FIXME: restore macro support
|
|
pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRange {
|
|
let parse = db.parse(frange.file_id);
|
|
try_extend_selection(parse.tree().syntax(), frange.range).unwrap_or(frange.range)
|
|
}
|
|
|
|
fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option<TextRange> {
|
|
let string_kinds = [COMMENT, STRING, RAW_STRING, BYTE_STRING, RAW_BYTE_STRING];
|
|
let list_kinds = [
|
|
RECORD_FIELD_PAT_LIST,
|
|
MATCH_ARM_LIST,
|
|
RECORD_FIELD_DEF_LIST,
|
|
TUPLE_FIELD_DEF_LIST,
|
|
RECORD_FIELD_LIST,
|
|
ENUM_VARIANT_LIST,
|
|
USE_TREE_LIST,
|
|
TYPE_PARAM_LIST,
|
|
TYPE_ARG_LIST,
|
|
TYPE_BOUND_LIST,
|
|
PARAM_LIST,
|
|
ARG_LIST,
|
|
ARRAY_EXPR,
|
|
TUPLE_EXPR,
|
|
WHERE_CLAUSE,
|
|
];
|
|
|
|
if range.is_empty() {
|
|
let offset = range.start();
|
|
let mut leaves = root.token_at_offset(offset);
|
|
if leaves.clone().all(|it| it.kind() == WHITESPACE) {
|
|
return Some(extend_ws(root, leaves.next()?, offset));
|
|
}
|
|
let leaf_range = match leaves {
|
|
TokenAtOffset::None => return None,
|
|
TokenAtOffset::Single(l) => {
|
|
if string_kinds.contains(&l.kind()) {
|
|
extend_single_word_in_comment_or_string(&l, offset)
|
|
.unwrap_or_else(|| l.text_range())
|
|
} else {
|
|
l.text_range()
|
|
}
|
|
}
|
|
TokenAtOffset::Between(l, r) => pick_best(l, r).text_range(),
|
|
};
|
|
return Some(leaf_range);
|
|
};
|
|
let node = match find_covering_element(root, range) {
|
|
NodeOrToken::Token(token) => {
|
|
if token.text_range() != range {
|
|
return Some(token.text_range());
|
|
}
|
|
if let Some(comment) = ast::Comment::cast(token.clone()) {
|
|
if let Some(range) = extend_comments(comment) {
|
|
return Some(range);
|
|
}
|
|
}
|
|
token.parent()
|
|
}
|
|
NodeOrToken::Node(node) => node,
|
|
};
|
|
if node.text_range() != range {
|
|
return Some(node.text_range());
|
|
}
|
|
|
|
// Using shallowest node with same range allows us to traverse siblings.
|
|
let node = node.ancestors().take_while(|n| n.text_range() == node.text_range()).last().unwrap();
|
|
|
|
if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true) {
|
|
if let Some(range) = extend_list_item(&node) {
|
|
return Some(range);
|
|
}
|
|
}
|
|
|
|
node.parent().map(|it| it.text_range())
|
|
}
|
|
|
|
fn extend_single_word_in_comment_or_string(
|
|
leaf: &SyntaxToken,
|
|
offset: TextUnit,
|
|
) -> Option<TextRange> {
|
|
let text: &str = leaf.text();
|
|
let cursor_position: u32 = (offset - leaf.text_range().start()).into();
|
|
|
|
let (before, after) = text.split_at(cursor_position as usize);
|
|
|
|
fn non_word_char(c: char) -> bool {
|
|
!(c.is_alphanumeric() || c == '_')
|
|
}
|
|
|
|
let start_idx = before.rfind(non_word_char)? as u32;
|
|
let end_idx = after.find(non_word_char).unwrap_or_else(|| after.len()) as u32;
|
|
|
|
let from: TextUnit = (start_idx + 1).into();
|
|
let to: TextUnit = (cursor_position + end_idx).into();
|
|
|
|
let range = TextRange::from_to(from, to);
|
|
if range.is_empty() {
|
|
None
|
|
} else {
|
|
Some(range + leaf.text_range().start())
|
|
}
|
|
}
|
|
|
|
fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextUnit) -> TextRange {
|
|
let ws_text = ws.text();
|
|
let suffix = TextRange::from_to(offset, ws.text_range().end()) - ws.text_range().start();
|
|
let prefix = TextRange::from_to(ws.text_range().start(), offset) - ws.text_range().start();
|
|
let ws_suffix = &ws_text.as_str()[suffix];
|
|
let ws_prefix = &ws_text.as_str()[prefix];
|
|
if ws_text.contains('\n') && !ws_suffix.contains('\n') {
|
|
if let Some(node) = ws.next_sibling_or_token() {
|
|
let start = match ws_prefix.rfind('\n') {
|
|
Some(idx) => ws.text_range().start() + TextUnit::from((idx + 1) as u32),
|
|
None => node.text_range().start(),
|
|
};
|
|
let end = if root.text().char_at(node.text_range().end()) == Some('\n') {
|
|
node.text_range().end() + TextUnit::of_char('\n')
|
|
} else {
|
|
node.text_range().end()
|
|
};
|
|
return TextRange::from_to(start, end);
|
|
}
|
|
}
|
|
ws.text_range()
|
|
}
|
|
|
|
fn pick_best<'a>(l: SyntaxToken, r: SyntaxToken) -> SyntaxToken {
|
|
return if priority(&r) > priority(&l) { r } else { l };
|
|
fn priority(n: &SyntaxToken) -> usize {
|
|
match n.kind() {
|
|
WHITESPACE => 0,
|
|
IDENT | T![self] | T![super] | T![crate] | LIFETIME => 2,
|
|
_ => 1,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Extend list item selection to include nearby delimiter and whitespace.
|
|
fn extend_list_item(node: &SyntaxNode) -> Option<TextRange> {
|
|
fn is_single_line_ws(node: &SyntaxToken) -> bool {
|
|
node.kind() == WHITESPACE && !node.text().contains('\n')
|
|
}
|
|
|
|
fn nearby_delimiter(
|
|
delimiter_kind: SyntaxKind,
|
|
node: &SyntaxNode,
|
|
dir: Direction,
|
|
) -> Option<SyntaxToken> {
|
|
node.siblings_with_tokens(dir)
|
|
.skip(1)
|
|
.skip_while(|node| match node {
|
|
NodeOrToken::Node(_) => false,
|
|
NodeOrToken::Token(it) => is_single_line_ws(it),
|
|
})
|
|
.next()
|
|
.and_then(|it| it.into_token())
|
|
.filter(|node| node.kind() == delimiter_kind)
|
|
}
|
|
|
|
let delimiter = match node.kind() {
|
|
TYPE_BOUND => T![+],
|
|
_ => T![,],
|
|
};
|
|
if let Some(delimiter_node) = nearby_delimiter(delimiter, node, Direction::Prev) {
|
|
return Some(TextRange::from_to(
|
|
delimiter_node.text_range().start(),
|
|
node.text_range().end(),
|
|
));
|
|
}
|
|
if let Some(delimiter_node) = nearby_delimiter(delimiter, node, Direction::Next) {
|
|
// Include any following whitespace when delimiter is after list item.
|
|
let final_node = delimiter_node
|
|
.next_sibling_or_token()
|
|
.and_then(|it| it.into_token())
|
|
.filter(|node| is_single_line_ws(node))
|
|
.unwrap_or(delimiter_node);
|
|
|
|
return Some(TextRange::from_to(node.text_range().start(), final_node.text_range().end()));
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
fn extend_comments(comment: ast::Comment) -> Option<TextRange> {
|
|
let prev = adj_comments(&comment, Direction::Prev);
|
|
let next = adj_comments(&comment, Direction::Next);
|
|
if prev != next {
|
|
Some(TextRange::from_to(
|
|
prev.syntax().text_range().start(),
|
|
next.syntax().text_range().end(),
|
|
))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn adj_comments(comment: &ast::Comment, dir: Direction) -> ast::Comment {
|
|
let mut res = comment.clone();
|
|
for element in comment.syntax().siblings_with_tokens(dir) {
|
|
let token = match element.as_token() {
|
|
None => break,
|
|
Some(token) => token,
|
|
};
|
|
if let Some(c) = ast::Comment::cast(token.clone()) {
|
|
res = c
|
|
} else if token.kind() != WHITESPACE || token.text().contains("\n\n") {
|
|
break;
|
|
}
|
|
}
|
|
res
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use ra_syntax::{AstNode, SourceFile};
|
|
use test_utils::extract_offset;
|
|
|
|
use super::*;
|
|
|
|
fn do_check(before: &str, afters: &[&str]) {
|
|
let (cursor, before) = extract_offset(before);
|
|
let parse = SourceFile::parse(&before);
|
|
let mut range = TextRange::offset_len(cursor, 0.into());
|
|
for &after in afters {
|
|
range = try_extend_selection(parse.tree().syntax(), range).unwrap();
|
|
let actual = &before[range];
|
|
assert_eq!(after, actual);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_arith() {
|
|
do_check(r#"fn foo() { <|>1 + 1 }"#, &["1", "1 + 1", "{ 1 + 1 }"]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_list() {
|
|
do_check(r#"fn foo(<|>x: i32) {}"#, &["x", "x: i32"]);
|
|
do_check(r#"fn foo(<|>x: i32, y: i32) {}"#, &["x", "x: i32", "x: i32, "]);
|
|
do_check(r#"fn foo(<|>x: i32,y: i32) {}"#, &["x", "x: i32", "x: i32,"]);
|
|
do_check(r#"fn foo(x: i32, <|>y: i32) {}"#, &["y", "y: i32", ", y: i32"]);
|
|
do_check(r#"fn foo(x: i32, <|>y: i32, ) {}"#, &["y", "y: i32", ", y: i32"]);
|
|
do_check(r#"fn foo(x: i32,<|>y: i32) {}"#, &["y", "y: i32", ",y: i32"]);
|
|
|
|
do_check(r#"const FOO: [usize; 2] = [ 22<|> , 33];"#, &["22", "22 , "]);
|
|
do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|>];"#, &["33", ", 33"]);
|
|
do_check(r#"const FOO: [usize; 2] = [ 22 , 33<|> ,];"#, &["33", ", 33"]);
|
|
|
|
do_check(r#"fn main() { (1, 2<|>) }"#, &["2", ", 2", "(1, 2)"]);
|
|
|
|
do_check(
|
|
r#"
|
|
const FOO: [usize; 2] = [
|
|
22,
|
|
<|>33,
|
|
]"#,
|
|
&["33", "33,"],
|
|
);
|
|
|
|
do_check(
|
|
r#"
|
|
const FOO: [usize; 2] = [
|
|
22
|
|
, 33<|>,
|
|
]"#,
|
|
&["33", ", 33"],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_start_of_the_line() {
|
|
do_check(
|
|
r#"
|
|
impl S {
|
|
<|> fn foo() {
|
|
|
|
}
|
|
}"#,
|
|
&[" fn foo() {\n\n }\n"],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_doc_comments() {
|
|
do_check(
|
|
r#"
|
|
struct A;
|
|
|
|
/// bla
|
|
/// bla
|
|
struct B {
|
|
<|>
|
|
}
|
|
"#,
|
|
&["\n \n", "{\n \n}", "/// bla\n/// bla\nstruct B {\n \n}"],
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_comments() {
|
|
do_check(
|
|
r#"
|
|
fn bar(){}
|
|
|
|
// fn foo() {
|
|
// 1 + <|>1
|
|
// }
|
|
|
|
// fn foo(){}
|
|
"#,
|
|
&["1", "// 1 + 1", "// fn foo() {\n// 1 + 1\n// }"],
|
|
);
|
|
|
|
do_check(
|
|
r#"
|
|
// #[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
// pub enum Direction {
|
|
// <|> Next,
|
|
// Prev
|
|
// }
|
|
"#,
|
|
&[
|
|
"// Next,",
|
|
"// #[derive(Debug, Clone, Copy, PartialEq, Eq)]\n// pub enum Direction {\n// Next,\n// Prev\n// }",
|
|
],
|
|
);
|
|
|
|
do_check(
|
|
r#"
|
|
/*
|
|
foo
|
|
_bar1<|>*/
|
|
"#,
|
|
&["_bar1", "/*\nfoo\n_bar1*/"],
|
|
);
|
|
|
|
do_check(r#"//!<|>foo_2 bar"#, &["foo_2", "//!foo_2 bar"]);
|
|
|
|
do_check(r#"/<|>/foo bar"#, &["//foo bar"]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_prefer_idents() {
|
|
do_check(
|
|
r#"
|
|
fn main() { foo<|>+bar;}
|
|
"#,
|
|
&["foo", "foo+bar"],
|
|
);
|
|
do_check(
|
|
r#"
|
|
fn main() { foo+<|>bar;}
|
|
"#,
|
|
&["bar", "foo+bar"],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_prefer_lifetimes() {
|
|
do_check(r#"fn foo<<|>'a>() {}"#, &["'a", "<'a>"]);
|
|
do_check(r#"fn foo<'a<|>>() {}"#, &["'a", "<'a>"]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_select_first_word() {
|
|
do_check(r#"// foo bar b<|>az quxx"#, &["baz", "// foo bar baz quxx"]);
|
|
do_check(
|
|
r#"
|
|
impl S {
|
|
fn foo() {
|
|
// hel<|>lo world
|
|
}
|
|
}
|
|
"#,
|
|
&["hello", "// hello world"],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_selection_string() {
|
|
do_check(
|
|
r#"
|
|
fn bar(){}
|
|
|
|
" fn f<|>oo() {"
|
|
"#,
|
|
&["foo", "\" fn foo() {\""],
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_trait_bounds_list_in_where_clause() {
|
|
do_check(
|
|
r#"
|
|
fn foo<R>()
|
|
where
|
|
R: req::Request + 'static,
|
|
R::Params: DeserializeOwned<|> + panic::UnwindSafe + 'static,
|
|
R::Result: Serialize + 'static,
|
|
"#,
|
|
&[
|
|
"DeserializeOwned",
|
|
"DeserializeOwned + ",
|
|
"DeserializeOwned + panic::UnwindSafe + 'static",
|
|
"R::Params: DeserializeOwned + panic::UnwindSafe + 'static",
|
|
"R::Params: DeserializeOwned + panic::UnwindSafe + 'static,",
|
|
],
|
|
);
|
|
do_check(r#"fn foo<T>() where T: <|>Copy"#, &["Copy"]);
|
|
do_check(r#"fn foo<T>() where T: <|>Copy + Display"#, &["Copy", "Copy + "]);
|
|
do_check(r#"fn foo<T>() where T: <|>Copy +Display"#, &["Copy", "Copy +"]);
|
|
do_check(r#"fn foo<T>() where T: <|>Copy+Display"#, &["Copy", "Copy+"]);
|
|
do_check(r#"fn foo<T>() where T: Copy + <|>Display"#, &["Display", "+ Display"]);
|
|
do_check(r#"fn foo<T>() where T: Copy + <|>Display + Sync"#, &["Display", "+ Display"]);
|
|
do_check(r#"fn foo<T>() where T: Copy +<|>Display"#, &["Display", "+Display"]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_extend_trait_bounds_list_inline() {
|
|
do_check(r#"fn foo<T: <|>Copy>() {}"#, &["Copy"]);
|
|
do_check(r#"fn foo<T: <|>Copy + Display>() {}"#, &["Copy", "Copy + "]);
|
|
do_check(r#"fn foo<T: <|>Copy +Display>() {}"#, &["Copy", "Copy +"]);
|
|
do_check(r#"fn foo<T: <|>Copy+Display>() {}"#, &["Copy", "Copy+"]);
|
|
do_check(r#"fn foo<T: Copy + <|>Display>() {}"#, &["Display", "+ Display"]);
|
|
do_check(r#"fn foo<T: Copy + <|>Display + Sync>() {}"#, &["Display", "+ Display"]);
|
|
do_check(r#"fn foo<T: Copy +<|>Display>() {}"#, &["Display", "+Display"]);
|
|
do_check(
|
|
r#"fn foo<T: Copy<|> + Display, U: Copy>() {}"#,
|
|
&[
|
|
"Copy",
|
|
"Copy + ",
|
|
"Copy + Display",
|
|
"T: Copy + Display",
|
|
"T: Copy + Display, ",
|
|
"<T: Copy + Display, U: Copy>",
|
|
],
|
|
);
|
|
}
|
|
}
|