Skip to content

Commit 3da52d2

Browse files
committed
simplify
1 parent e5e6c36 commit 3da52d2

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

crates/ide/src/matching_brace.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ use syntax::{
1919
pub(crate) fn matching_brace(file: &SourceFile, offset: TextSize) -> Option<TextSize> {
2020
const BRACES: &[SyntaxKind] =
2121
&[T!['{'], T!['}'], T!['['], T![']'], T!['('], T![')'], T![<], T![>], T![|], T![|]];
22-
let (brace_token, brace_idx) = file
23-
.syntax()
24-
.token_at_offset(offset)
25-
.filter_map(|node| {
26-
let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
27-
Some((node, idx))
28-
})
29-
.next()?;
22+
let (brace_token, brace_idx) = file.syntax().token_at_offset(offset).find_map(|node| {
23+
let idx = BRACES.iter().position(|&brace| brace == node.kind())?;
24+
Some((node, idx))
25+
})?;
3026
let parent = brace_token.parent()?;
3127
if brace_token.kind() == T![|] && !ast::ParamList::can_cast(parent.kind()) {
3228
cov_mark::hit!(pipes_not_braces);

crates/ide/src/parent_module.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use hir::Semantics;
2-
use ide_db::base_db::{CrateId, FileId, FilePosition};
3-
use ide_db::RootDatabase;
2+
use ide_db::{
3+
base_db::{CrateId, FileId, FilePosition},
4+
RootDatabase,
5+
};
46
use itertools::Itertools;
57
use syntax::{
68
algo::find_node_at_offset,

0 commit comments

Comments
 (0)