nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-04 20:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Adding tuple fields in ADT, chore: test action section

Browse Source 
unindentation
This commit is contained in:
vi_mi 2021-10-12 07:58:10 +00:00 committed by Laurențiu Nicola
parent 227490c069
commit 2efcff7f75
1 changed files with 190 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

361
crates/ide_assists/src/handlers/extract_module.rs
View File

@ -100,6 +100,8 @@ pub(crate) fn extract_module(acc: &mut Assists, ctx: &AssistContext) -> Option<(
"Extract Module", "Extract Module",
module.text_range, module.text_range,
|builder| { |builder| {
let _ = &module;
let mut body_items = Vec::new(); let mut body_items = Vec::new();
let new_item_indent = old_item_indent + 1; let new_item_indent = old_item_indent + 1;
for item in module.body_items { for item in module.body_items {
@ -148,7 +150,7 @@ struct Module {
} }
fn extract_target(node: &SyntaxNode, selection_range: TextRange) -> Option<Module> { fn extract_target(node: &SyntaxNode, selection_range: TextRange) -> Option<Module> {
let body_items: Vec<ast::Item> = node let mut body_items: Vec<ast::Item> = node
.children() .children()
.filter_map(|child| { .filter_map(|child| {
if let Some(item) = ast::Item::cast(child.clone()) { if let Some(item) = ast::Item::cast(child.clone()) {
@ -161,6 +163,10 @@ fn extract_target(node: &SyntaxNode, selection_range: TextRange) -> Option<Modul
}) })
.collect(); .collect();
if let Some(node_item) = ast::Item::cast(node.clone()) {
body_items.push(node_item);
}
Some(Module { text_range: selection_range, name: "modname".to_string(), body_items }) Some(Module { text_range: selection_range, name: "modname".to_string(), body_items })
} }
@ -169,7 +175,7 @@ impl Module {
&self, &self,
ctx: &AssistContext, ctx: &AssistContext,
) -> (HashMap<FileId, Vec<(TextRange, String)>>, Vec<SyntaxNode>) { ) -> (HashMap<FileId, Vec<(TextRange, String)>>, Vec<SyntaxNode>) {
let mut record_fields = Vec::new(); let mut adt_fields = Vec::new();
let mut refs: HashMap<FileId, Vec<(TextRange, String)>> = HashMap::new(); let mut refs: HashMap<FileId, Vec<(TextRange, String)>> = HashMap::new();
//Here impl is not included as each item inside impl will be tied to the parent of //Here impl is not included as each item inside impl will be tied to the parent of
@ -183,18 +189,31 @@ impl Module {
let node_def = Definition::ModuleDef(nod.into()); let node_def = Definition::ModuleDef(nod.into());
self.expand_and_group_usages_file_wise(ctx, node_def, &mut refs); self.expand_and_group_usages_file_wise(ctx, node_def, &mut refs);
let mut get_record_fields = |it: ast::Adt| {
for desc in it.syntax().descendants() {
if let Some(record_field) = ast::RecordField::cast(desc) {
record_fields.push(record_field.syntax().clone());
}
}
};
//Enum Fields are not allowed to explicitly specify pub, it is implied //Enum Fields are not allowed to explicitly specify pub, it is implied
match it { match it {
ast::Adt::Struct(_) => get_record_fields(it), ast::Adt::Struct(x) => {
ast::Adt::Union(_) => get_record_fields(it), if let Some(field_list) = x.field_list() {
match field_list {
ast::FieldList::RecordFieldList(record_field_list) => {
record_field_list.fields().for_each(|record_field| {
adt_fields.push(record_field.syntax().clone());
});
},
ast::FieldList::TupleFieldList(tuple_field_list) => {
tuple_field_list.fields().for_each(|tuple_field| {
adt_fields.push(tuple_field.syntax().clone());
});
},
}
}
},
ast::Adt::Union(x) => {
if let Some(record_field_list) = x.record_field_list() {
record_field_list.fields().for_each(|record_field| {
adt_fields.push(record_field.syntax().clone());
});
}
},
ast::Adt::Enum(_) => {}, ast::Adt::Enum(_) => {},
} }
} }
@ -228,7 +247,7 @@ impl Module {
} }
}); });
return (refs, record_fields); return (refs, adt_fields);
} }
fn expand_and_group_usages_file_wise( fn expand_and_group_usages_file_wise(
@ -881,9 +900,9 @@ mod tests {
check_assist_not_applicable( check_assist_not_applicable(
extract_module, extract_module,
r" r"
$0pub struct PublicStruct { $0pub struct PublicStruct {
field: i32, field: i32,
} }
", ",
) )
} }
@ -920,25 +939,25 @@ mod tests {
let _a = bar(); let _a = bar();
} }
$0 $0
struct PrivateStruct { struct PrivateStruct {
inner: SomeType, inner: SomeType,
} }
pub struct PrivateStruct1 { pub struct PrivateStruct1 {
pub inner: i32, pub inner: i32,
} }
impl PrivateStruct { impl PrivateStruct {
fn new() -> Self { fn new() -> Self {
PrivateStruct { inner: SomeType } PrivateStruct { inner: SomeType }
} }
} }
fn bar() -> i32 { fn bar() -> i32 {
2 2
} }
$0 $0
} }
", ",
r" r"
@ -969,27 +988,27 @@ mod tests {
let _a = modname::bar(); let _a = modname::bar();
} }
mod modname { mod modname {
use crate::thirdpartycrate::nest::SomeType; use crate::thirdpartycrate::nest::SomeType;
pub(crate) struct PrivateStruct { pub(crate) struct PrivateStruct {
pub(crate) inner: SomeType, pub(crate) inner: SomeType,
} }
pub(crate) struct PrivateStruct1 { pub(crate) struct PrivateStruct1 {
pub(crate) inner: i32, pub(crate) inner: i32,
} }
impl PrivateStruct { impl PrivateStruct {
pub(crate) fn new() -> Self { pub(crate) fn new() -> Self {
PrivateStruct { inner: SomeType } PrivateStruct { inner: SomeType }
} }
} }
pub(crate) fn bar() -> i32 { pub(crate) fn bar() -> i32 {
2 2
} }
} }
} }
", ",
); );
@ -1000,22 +1019,22 @@ mod tests {
check_assist( check_assist(
extract_module, extract_module,
r" r"
$0 $0
fn foo(name: i32) -> i32 { fn foo(name: i32) -> i32 {
name + 1 name + 1
} }
$0 $0
fn bar(name: i32) -> i32 { fn bar(name: i32) -> i32 {
name + 2 name + 2
} }
", ",
r" r"
mod modname { mod modname {
pub(crate) fn foo(name: i32) -> i32 { pub(crate) fn foo(name: i32) -> i32 {
name + 1 name + 1
} }
} }
fn bar(name: i32) -> i32 { fn bar(name: i32) -> i32 {
name + 2 name + 2
@ -1030,15 +1049,15 @@ mod tests {
extract_module, extract_module,
r" r"
mod impl_play { mod impl_play {
$0 $0
struct A {} struct A {}
impl A { impl A {
pub fn new_a() -> i32 { pub fn new_a() -> i32 {
2 2
} }
} }
$0 $0
fn a() { fn a() {
let _a = A::new_a(); let _a = A::new_a();
@ -1047,15 +1066,15 @@ mod tests {
", ",
r" r"
mod impl_play { mod impl_play {
mod modname { mod modname {
pub(crate) struct A {} pub(crate) struct A {}
impl A { impl A {
pub(crate) fn new_a() -> i32 { pub(crate) fn new_a() -> i32 {
2 2
} }
} }
} }
fn a() { fn a() {
let _a = modname::A::new_a(); let _a = modname::A::new_a();
@ -1078,11 +1097,11 @@ mod tests {
mod bar { mod bar {
use super::foo::{PrivateStruct, PrivateStruct1}; use super::foo::{PrivateStruct, PrivateStruct1};
$0 $0
struct Strukt { struct Strukt {
field: PrivateStruct, field: PrivateStruct,
} }
$0 $0
struct Strukt1 { struct Strukt1 {
field: PrivateStruct1, field: PrivateStruct1,
@ -1098,13 +1117,13 @@ mod tests {
mod bar { mod bar {
use super::foo::{PrivateStruct1}; use super::foo::{PrivateStruct1};
mod modname { mod modname {
use super::super::foo::PrivateStruct; use super::super::foo::PrivateStruct;
pub(crate) struct Strukt { pub(crate) struct Strukt {
pub(crate) field: PrivateStruct, pub(crate) field: PrivateStruct,
} }
} }
struct Strukt1 { struct Strukt1 {
field: PrivateStruct1, field: PrivateStruct1,
@ -1126,11 +1145,11 @@ mod tests {
mod bar { mod bar {
use super::foo::PrivateStruct; use super::foo::PrivateStruct;
$0 $0
struct Strukt { struct Strukt {
field: PrivateStruct, field: PrivateStruct,
} }
$0 $0
struct Strukt1 { struct Strukt1 {
field: PrivateStruct, field: PrivateStruct,
@ -1145,13 +1164,13 @@ mod tests {
mod bar { mod bar {
use super::foo::PrivateStruct; use super::foo::PrivateStruct;
mod modname { mod modname {
use super::super::foo::PrivateStruct; use super::super::foo::PrivateStruct;
pub(crate) struct Strukt { pub(crate) struct Strukt {
pub(crate) field: PrivateStruct, pub(crate) field: PrivateStruct,
} }
} }
struct Strukt1 { struct Strukt1 {
field: PrivateStruct, field: PrivateStruct,
@ -1169,11 +1188,11 @@ mod tests {
mod bar { mod bar {
pub struct PrivateStruct; pub struct PrivateStruct;
$0 $0
struct Strukt { struct Strukt {
field: PrivateStruct, field: PrivateStruct,
} }
$0 $0
struct Strukt1 { struct Strukt1 {
field: PrivateStruct, field: PrivateStruct,
@ -1184,13 +1203,13 @@ mod tests {
mod bar { mod bar {
pub struct PrivateStruct; pub struct PrivateStruct;
mod modname { mod modname {
use super::PrivateStruct; use super::PrivateStruct;
pub(crate) struct Strukt { pub(crate) struct Strukt {
pub(crate) field: PrivateStruct, pub(crate) field: PrivateStruct,
} }
} }
struct Strukt1 { struct Strukt1 {
field: PrivateStruct, field: PrivateStruct,
@ -1208,13 +1227,13 @@ mod tests {
mod impl_play { mod impl_play {
struct A {} struct A {}
$0 $0
impl A { impl A {
pub fn new_a() -> i32 { pub fn new_a() -> i32 {
2 2
} }
} }
$0 $0
fn a() { fn a() {
let _a = A::new_a(); let _a = A::new_a();
@ -1225,15 +1244,15 @@ mod tests {
mod impl_play { mod impl_play {
struct A {} struct A {}
mod modname { mod modname {
use super::A; use super::A;
impl A { impl A {
pub(crate) fn new_a() -> i32 { pub(crate) fn new_a() -> i32 {
2 2
} }
} }
} }
fn a() { fn a() {
let _a = A::new_a(); let _a = A::new_a();
@ -1255,13 +1274,13 @@ mod tests {
mod impl_play { mod impl_play {
use super::foo::A; use super::foo::A;
$0 $0
impl A { impl A {
pub fn new_a() -> i32 { pub fn new_a() -> i32 {
2 2
} }
} }
$0 $0
fn a() { fn a() {
let _a = A::new_a(); let _a = A::new_a();
@ -1275,15 +1294,15 @@ mod tests {
mod impl_play { mod impl_play {
use super::foo::A; use super::foo::A;
mod modname { mod modname {
use super::super::foo::A; use super::super::foo::A;
impl A { impl A {
pub(crate) fn new_a() -> i32 { pub(crate) fn new_a() -> i32 {
2 2
} }
} }
} }
fn a() { fn a() {
let _a = A::new_a(); let _a = A::new_a();
@ -1301,42 +1320,42 @@ mod tests {
mod impl_play2 { mod impl_play2 {
trait JustATrait {} trait JustATrait {}
$0 $0
struct A {} struct A {}
fn foo<T: JustATrait>(arg: T) -> T { fn foo<T: JustATrait>(arg: T) -> T {
arg arg
} }
impl JustATrait for A {} impl JustATrait for A {}
fn bar() { fn bar() {
let a = A {}; let a = A {};
foo(a); foo(a);
} }
$0 $0
} }
", ",
r" r"
mod impl_play2 { mod impl_play2 {
trait JustATrait {} trait JustATrait {}
mod modname { mod modname {
use super::JustATrait; use super::JustATrait;
pub(crate) struct A {} pub(crate) struct A {}
pub(crate) fn foo<T: JustATrait>(arg: T) -> T { pub(crate) fn foo<T: JustATrait>(arg: T) -> T {
arg arg
} }
impl JustATrait for A {} impl JustATrait for A {}
pub(crate) fn bar() { pub(crate) fn bar() {
let a = A {}; let a = A {};
foo(a); foo(a);
} }
} }
} }
", ",
) )
@ -1348,20 +1367,20 @@ mod tests {
extract_module, extract_module,
r" r"
mod impl_play2 { mod impl_play2 {
$0 $0
mod impl_play { mod impl_play {
pub struct A {} pub struct A {}
} }
$0 $0
} }
", ",
r" r"
mod impl_play2 { mod impl_play2 {
mod modname { mod modname {
pub(crate) mod impl_play { pub(crate) mod impl_play {
pub struct A {} pub struct A {}
} }
} }
} }
", ",
) )