aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_assists/src/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_assists/src/handlers')
-rw-r--r--crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs11
1 files changed, 3 insertions, 8 deletions
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index b4e19b3dc..497f887cd 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -1,11 +1,10 @@
1use hir::{EnumVariant, Module, ModuleDef, Name}; 1use hir::{EnumVariant, Module, ModuleDef, Name};
2use ra_db::FileId; 2use ra_db::FileId;
3use ra_fmt::leading_indent;
4use ra_ide_db::{defs::Definition, search::Reference, RootDatabase}; 3use ra_ide_db::{defs::Definition, search::Reference, RootDatabase};
5use rustc_hash::FxHashSet; 4use rustc_hash::FxHashSet;
6use syntax::{ 5use syntax::{
7 algo::find_node_at_offset, 6 algo::find_node_at_offset,
8 ast::{self, ArgListOwner, AstNode, NameOwner, VisibilityOwner}, 7 ast::{self, edit::IndentLevel, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
9 SourceFile, TextRange, TextSize, 8 SourceFile, TextRange, TextSize,
10}; 9};
11 10
@@ -112,7 +111,7 @@ fn insert_import(
112 Some(()) 111 Some(())
113} 112}
114 113
115// FIXME: this should use strongly-typed `make`, rather than string manipulation1 114// FIXME: this should use strongly-typed `make`, rather than string manipulation.
116fn extract_struct_def( 115fn extract_struct_def(
117 builder: &mut AssistBuilder, 116 builder: &mut AssistBuilder,
118 enum_: &ast::Enum, 117 enum_: &ast::Enum,
@@ -127,11 +126,7 @@ fn extract_struct_def(
127 } else { 126 } else {
128 "".to_string() 127 "".to_string()
129 }; 128 };
130 let indent = if let Some(indent) = leading_indent(enum_.syntax()) { 129 let indent = IndentLevel::from_node(enum_.syntax());
131 indent.to_string()
132 } else {
133 "".to_string()
134 };
135 let struct_def = format!( 130 let struct_def = format!(
136 r#"{}struct {}{}; 131 r#"{}struct {}{};
137 132