Unnamed repository; edit this file 'description' to name the repository.
update syntax with new syntaxeditor
bit-aloo 7 weeks ago
parent a5a5fbf · commit 5febd30
-rw-r--r--crates/syntax/src/ast/edit.rs6
-rw-r--r--crates/syntax/src/syntax_editor/edits.rs5
2 files changed, 5 insertions, 6 deletions
diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index b706d7f722..23a0411ead 100644
--- a/crates/syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
@@ -105,8 +105,7 @@ impl IndentLevel {
}
pub(super) fn clone_increase_indent(self, node: &SyntaxNode) -> SyntaxNode {
- let node = node.clone_subtree();
- let mut editor = SyntaxEditor::new(node.clone());
+ let (mut editor, node) = SyntaxEditor::new(node.clone());
let tokens = node
.preorder_with_tokens()
.filter_map(|event| match event {
@@ -140,8 +139,7 @@ impl IndentLevel {
}
pub(super) fn clone_decrease_indent(self, node: &SyntaxNode) -> SyntaxNode {
- let node = node.clone_subtree();
- let mut editor = SyntaxEditor::new(node.clone());
+ let (mut editor, node) = SyntaxEditor::new(node.clone());
let tokens = node
.preorder_with_tokens()
.filter_map(|event| match event {
diff --git a/crates/syntax/src/syntax_editor/edits.rs b/crates/syntax/src/syntax_editor/edits.rs
index 44f0a8038e..253df826d7 100644
--- a/crates/syntax/src/syntax_editor/edits.rs
+++ b/crates/syntax/src/syntax_editor/edits.rs
@@ -473,8 +473,9 @@ enum Foo {
}
fn check_add_variant(before: &str, expected: &str, variant: ast::Variant) {
- let enum_ = ast_from_text::<ast::Enum>(before);
- let mut editor = SyntaxEditor::new(enum_.syntax().clone());
+ let (mut editor, enum_) =
+ SyntaxEditor::new(ast_from_text::<ast::Enum>(before).syntax().clone());
+ let enum_ = ast::Enum::cast(enum_).unwrap();
if let Some(it) = enum_.variant_list() {
it.add_variant(&mut editor, &variant)
}