Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use syntax's version of SyntaxElement

Browse source
This commit is contained in:
DropDemBits 2023-07-16 16:21:49 -04:00
parent cc4e06f04b
commit 92422f7488
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/syntax/src/ast/edit_in_place.rs
View file

@ -3,13 +3,12 @@
use std::iter::{empty, successors}; use std::iter::{empty, successors};
use parser::{SyntaxKind, T}; use parser::{SyntaxKind, T};
use rowan::SyntaxElement;
use crate::{ use crate::{
algo::{self, neighbor}, algo::{self, neighbor},
ast::{self, edit::IndentLevel, make, HasGenericParams}, ast::{self, edit::IndentLevel, make, HasGenericParams},
ted::{self, Position}, ted::{self, Position},
AstNode, AstToken, Direction, AstNode, AstToken, Direction, SyntaxElement,
SyntaxKind::{ATTR, COMMENT, WHITESPACE}, SyntaxKind::{ATTR, COMMENT, WHITESPACE},
SyntaxNode, SyntaxToken, SyntaxNode, SyntaxToken,
}; };
@ -577,7 +576,7 @@ impl ast::AssocItemList {
None => (IndentLevel::single(), Position::last_child_of(self.syntax()), "\n"), None => (IndentLevel::single(), Position::last_child_of(self.syntax()), "\n"),
}, },
}; };
let elements: Vec<SyntaxElement<_>> = vec![ let elements: Vec<SyntaxElement> = vec![
make::tokens::whitespace(&format!("{whitespace}{indent}")).into(), make::tokens::whitespace(&format!("{whitespace}{indent}")).into(),
item.syntax().clone().into(), item.syntax().clone().into(),
]; ];
@ -771,7 +770,7 @@ impl ast::VariantList {
None => (IndentLevel::single(), Position::last_child_of(self.syntax())), None => (IndentLevel::single(), Position::last_child_of(self.syntax())),
}, },
}; };
let elements: Vec<SyntaxElement<_>> = vec![ let elements: Vec<SyntaxElement> = vec![
make::tokens::whitespace(&format!("{}{indent}", "\n")).into(), make::tokens::whitespace(&format!("{}{indent}", "\n")).into(),
variant.syntax().clone().into(), variant.syntax().clone().into(),
ast::make::token(T![,]).into(), ast::make::token(T![,]).into(),