Skip to content

Commit a8587f1

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #7286
7286: Remove useless wrapper r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents 0c58aa9 + 6dbba4d commit a8587f1

File tree

9 files changed

+20
-28
lines changed

9 files changed

+20
-28
lines changed

‎crates/assists/src/assist_context.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
33
use std::mem;
44

5-
use algo::find_covering_element;
65
use hir::Semantics;
76
use ide_db::{
87
base_db::{AnchoredPathBuf, FileId, FileRange},
@@ -94,11 +93,11 @@ impl<'a> AssistContext<'a> {
9493
self.sema.find_node_at_offset_with_descend(self.source_file.syntax(), self.offset())
9594
}
9695
pub(crate) fn covering_element(&self) -> SyntaxElement {
97-
find_covering_element(self.source_file.syntax(), self.frange.range)
96+
self.source_file.syntax().covering_element(self.frange.range)
9897
}
9998
// FIXME: remove
10099
pub(crate) fn covering_node_for_range(&self, range: TextRange) -> SyntaxElement {
101-
find_covering_element(self.source_file.syntax(), range)
100+
self.source_file.syntax().covering_element(range)
102101
}
103102
}
104103

‎crates/completion/src/context.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ use hir::{Local, ScopeDef, Semantics, SemanticsScope, Type};
44
use ide_db::base_db::{FilePosition, SourceDatabase};
55
use ide_db::{call_info::ActiveParameter, RootDatabase};
66
use syntax::{
7-
algo::{find_covering_element, find_node_at_offset},
8-
ast, match_ast, AstNode, NodeOrToken,
9-
SyntaxKind::*,
10-
SyntaxNode, SyntaxToken, TextRange, TextSize,
7+
algo::find_node_at_offset, ast, match_ast, AstNode, NodeOrToken, SyntaxKind::*, SyntaxNode,
8+
SyntaxToken, TextRange, TextSize,
119
};
1210
use test_utils::mark;
1311
use text_edit::Indel;
@@ -513,7 +511,7 @@ impl<'a> CompletionContext<'a> {
513511
}
514512

515513
fn find_node_with_range<N: AstNode>(syntax: &SyntaxNode, range: TextRange) -> Option<N> {
516-
find_covering_element(syntax, range).ancestors().find_map(N::cast)
514+
syntax.covering_element(range).ancestors().find_map(N::cast)
517515
}
518516

519517
fn is_node<N: AstNode>(node: &SyntaxNode) -> bool {

‎crates/hir_expand/src/db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub fn expand_hypothetical(
118118
parse_macro_with_arg(db, macro_file, Some(std::sync::Arc::new((tt, tmap_1)))).value?;
119119
let token_id = macro_def.0.map_id_down(token_id);
120120
let range = tmap_2.range_by_token(token_id)?.by_kind(token_to_map.kind())?;
121-
let token = syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?;
121+
let token = node.syntax_node().covering_element(range).into_token()?;
122122
Some((node.syntax_node(), token))
123123
}
124124

‎crates/hir_expand/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use std::sync::Arc;
2222

2323
use base_db::{impl_intern_key, salsa, CrateId, FileId, FileRange};
2424
use syntax::{
25-
algo::{self, skip_trivia_token},
25+
algo::skip_trivia_token,
2626
ast::{self, AstNode},
2727
Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
2828
};
@@ -335,7 +335,7 @@ impl ExpansionInfo {
335335

336336
let range = self.exp_map.range_by_token(token_id)?.by_kind(token.value.kind())?;
337337

338-
let token = algo::find_covering_element(&self.expanded.value, range).into_token()?;
338+
let token = self.expanded.value.covering_element(range).into_token()?;
339339

340340
Some(self.expanded.with_value(token))
341341
}
@@ -360,8 +360,8 @@ impl ExpansionInfo {
360360
};
361361

362362
let range = token_map.range_by_token(token_id)?.by_kind(token.value.kind())?;
363-
let token = algo::find_covering_element(&tt.value, range + tt.value.text_range().start())
364-
.into_token()?;
363+
let token =
364+
tt.value.covering_element(range + tt.value.text_range().start()).into_token()?;
365365
Some((tt.with_value(token), origin))
366366
}
367367
}

‎crates/ide/src/extend_selection.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::iter::successors;
33
use hir::Semantics;
44
use ide_db::RootDatabase;
55
use syntax::{
6-
algo::{self, find_covering_element, skip_trivia_token},
6+
algo::{self, skip_trivia_token},
77
ast::{self, AstNode, AstToken},
88
Direction, NodeOrToken,
99
SyntaxKind::{self, *},
@@ -76,7 +76,7 @@ fn try_extend_selection(
7676
};
7777
return Some(leaf_range);
7878
};
79-
let node = match find_covering_element(root, range) {
79+
let node = match root.covering_element(range) {
8080
NodeOrToken::Token(token) => {
8181
if token.text_range() != range {
8282
return Some(token.text_range());
@@ -120,7 +120,7 @@ fn extend_tokens_from_range(
120120
macro_call: ast::MacroCall,
121121
original_range: TextRange,
122122
) -> Option<TextRange> {
123-
let src = find_covering_element(&macro_call.syntax(), original_range);
123+
let src = macro_call.syntax().covering_element(original_range);
124124
let (first_token, last_token) = match src {
125125
NodeOrToken::Node(it) => (it.first_token()?, it.last_token()?),
126126
NodeOrToken::Token(it) => (it.clone(), it),

‎crates/ide/src/join_lines.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use assists::utils::extract_trivial_expression;
22
use itertools::Itertools;
33
use syntax::{
4-
algo::{find_covering_element, non_trivia_sibling},
4+
algo::non_trivia_sibling,
55
ast::{self, AstNode, AstToken},
66
Direction, NodeOrToken, SourceFile,
77
SyntaxKind::{self, USE_TREE, WHITESPACE},
@@ -31,7 +31,7 @@ pub(crate) fn join_lines(file: &SourceFile, range: TextRange) -> TextEdit {
3131
range
3232
};
3333

34-
let node = match find_covering_element(file.syntax(), range) {
34+
let node = match file.syntax().covering_element(range) {
3535
NodeOrToken::Node(node) => node,
3636
NodeOrToken::Token(token) => token.parent(),
3737
};

‎crates/ide/src/syntax_tree.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use ide_db::base_db::{FileId, SourceDatabase};
22
use ide_db::RootDatabase;
33
use syntax::{
4-
algo, AstNode, NodeOrToken, SourceFile, SyntaxKind::STRING, SyntaxToken, TextRange, TextSize,
4+
AstNode, NodeOrToken, SourceFile, SyntaxKind::STRING, SyntaxToken, TextRange, TextSize,
55
};
66

77
// Feature: Show Syntax Tree
@@ -21,7 +21,7 @@ pub(crate) fn syntax_tree(
2121
) -> String {
2222
let parse = db.parse(file_id);
2323
if let Some(text_range) = text_range {
24-
let node = match algo::find_covering_element(parse.tree().syntax(), text_range) {
24+
let node = match parse.tree().syntax().covering_element(text_range) {
2525
NodeOrToken::Node(node) => node,
2626
NodeOrToken::Token(token) => {
2727
if let Some(tree) = syntax_tree_for_string(&token, text_range) {

‎crates/syntax/src/algo.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn find_node_at_offset<N: AstNode>(syntax: &SyntaxNode, offset: TextSize) ->
4545
}
4646

4747
pub fn find_node_at_range<N: AstNode>(syntax: &SyntaxNode, range: TextRange) -> Option<N> {
48-
find_covering_element(syntax, range).ancestors().find_map(N::cast)
48+
syntax.covering_element(range).ancestors().find_map(N::cast)
4949
}
5050

5151
/// Skip to next non `trivia` token
@@ -74,10 +74,6 @@ pub fn non_trivia_sibling(element: SyntaxElement, direction: Direction) -> Optio
7474
}
7575
}
7676

77-
pub fn find_covering_element(root: &SyntaxNode, range: TextRange) -> SyntaxElement {
78-
root.covering_element(range)
79-
}
80-
8177
pub fn least_common_ancestor(u: &SyntaxNode, v: &SyntaxNode) -> Option<SyntaxNode> {
8278
if u == v {
8379
return Some(u.clone());

‎crates/syntax/src/parsing/reparsing.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use parser::Reparser;
1010
use text_edit::Indel;
1111

1212
use crate::{
13-
algo,
1413
parsing::{
1514
lexer::{lex_single_syntax_kind, tokenize, Token},
1615
text_token_source::TextTokenSource,
@@ -41,7 +40,7 @@ fn reparse_token<'node>(
4140
root: &'node SyntaxNode,
4241
edit: &Indel,
4342
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
44-
let prev_token = algo::find_covering_element(root, edit.delete).as_token()?.clone();
43+
let prev_token = root.covering_element(edit.delete).as_token()?.clone();
4544
let prev_token_kind = prev_token.kind();
4645
match prev_token_kind {
4746
WHITESPACE | COMMENT | IDENT | STRING => {
@@ -124,7 +123,7 @@ fn is_contextual_kw(text: &str) -> bool {
124123
}
125124

126125
fn find_reparsable_node(node: &SyntaxNode, range: TextRange) -> Option<(SyntaxNode, Reparser)> {
127-
let node = algo::find_covering_element(node, range);
126+
let node = node.covering_element(range);
128127

129128
let mut ancestors = match node {
130129
NodeOrToken::Token(it) => it.parent().ancestors(),

0 commit comments

Comments
 (0)