From aa69757a01c26cfad12498053c55cbc3d66a4bdb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 23 Jun 2020 22:27:24 +0200 Subject: More principled indentation trimming in fixtures --- .../completion/complete_macro_in_item_position.rs | 16 +-- .../src/completion/complete_qualified_path.rs | 112 ++++++++++----------- .../src/completion/complete_unqualified_path.rs | 48 ++++----- 3 files changed, 88 insertions(+), 88 deletions(-) (limited to 'crates/ra_ide/src/completion') diff --git a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs index d9bb5fd25..4c33f41d4 100644 --- a/crates/ra_ide/src/completion/complete_macro_in_item_position.rs +++ b/crates/ra_ide/src/completion/complete_macro_in_item_position.rs @@ -42,8 +42,8 @@ mod tests { [ CompletionItem { label: "foo!(…)", - source_range: 46..46, - delete: 46..46, + source_range: 48..48, + delete: 48..48, insert: "foo!($0)", kind: Macro, detail: "macro_rules! foo", @@ -82,8 +82,8 @@ mod tests { [ CompletionItem { label: "vec![…]", - source_range: 280..280, - delete: 280..280, + source_range: 282..282, + delete: 282..282, insert: "vec![$0]", kind: Macro, detail: "macro_rules! vec", @@ -119,8 +119,8 @@ mod tests { [ CompletionItem { label: "foo! {…}", - source_range: 163..163, - delete: 163..163, + source_range: 164..164, + delete: 164..164, insert: "foo! {$0}", kind: Macro, detail: "macro_rules! foo", @@ -130,8 +130,8 @@ mod tests { }, CompletionItem { label: "main()", - source_range: 163..163, - delete: 163..163, + source_range: 164..164, + delete: 164..164, insert: "main()$0", kind: Function, lookup: "main", diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs index 02ac0166b..d3a1cbc1d 100644 --- a/crates/ra_ide/src/completion/complete_qualified_path.rs +++ b/crates/ra_ide/src/completion/complete_qualified_path.rs @@ -541,8 +541,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 100..100, - delete: 100..100, + source_range: 102..102, + delete: 102..102, insert: "m()$0", kind: Function, lookup: "m", @@ -577,8 +577,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 105..105, - delete: 105..105, + source_range: 107..107, + delete: 107..107, insert: "m()$0", kind: Method, lookup: "m", @@ -613,8 +613,8 @@ mod tests { [ CompletionItem { label: "C", - source_range: 107..107, - delete: 107..107, + source_range: 109..109, + delete: 109..109, insert: "C", kind: Const, detail: "const C: i32 = 42;", @@ -648,8 +648,8 @@ mod tests { [ CompletionItem { label: "T", - source_range: 101..101, - delete: 101..101, + source_range: 103..103, + delete: 103..103, insert: "T", kind: TypeAlias, detail: "type T = i32;", @@ -688,24 +688,24 @@ mod tests { [ CompletionItem { label: "PUBLIC_CONST", - source_range: 302..302, - delete: 302..302, + source_range: 304..304, + delete: 304..304, insert: "PUBLIC_CONST", kind: Const, detail: "pub(super) const PUBLIC_CONST: u32 = 1;", }, CompletionItem { label: "PublicType", - source_range: 302..302, - delete: 302..302, + source_range: 304..304, + delete: 304..304, insert: "PublicType", kind: TypeAlias, detail: "pub(super) type PublicType = u32;", }, CompletionItem { label: "public_method()", - source_range: 302..302, - delete: 302..302, + source_range: 304..304, + delete: 304..304, insert: "public_method()$0", kind: Function, lookup: "public_method", @@ -737,8 +737,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 100..100, - delete: 100..100, + source_range: 102..102, + delete: 102..102, insert: "m()$0", kind: Function, lookup: "m", @@ -773,8 +773,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 101..101, - delete: 101..101, + source_range: 103..103, + delete: 103..103, insert: "m()$0", kind: Function, lookup: "m", @@ -834,8 +834,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 73..73, - delete: 73..73, + source_range: 74..74, + delete: 74..74, insert: "m()$0", kind: Function, lookup: "m", @@ -870,8 +870,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 99..99, - delete: 99..99, + source_range: 101..101, + delete: 101..101, insert: "m()$0", kind: Function, lookup: "m", @@ -906,8 +906,8 @@ mod tests { [ CompletionItem { label: "m()", - source_range: 110..110, - delete: 110..110, + source_range: 112..112, + delete: 112..112, insert: "m()$0", kind: Function, lookup: "m", @@ -950,40 +950,40 @@ mod tests { [ CompletionItem { label: "C2", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "C2", kind: Const, detail: "const C2: ();", }, CompletionItem { label: "CONST", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "CONST", kind: Const, detail: "const CONST: u8;", }, CompletionItem { label: "SubTy", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "SubTy", kind: TypeAlias, detail: "type SubTy;", }, CompletionItem { label: "Ty", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "Ty", kind: TypeAlias, detail: "type Ty;", }, CompletionItem { label: "func()", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "func()$0", kind: Function, lookup: "func", @@ -991,8 +991,8 @@ mod tests { }, CompletionItem { label: "method()", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "method()$0", kind: Method, lookup: "method", @@ -1000,8 +1000,8 @@ mod tests { }, CompletionItem { label: "subfunc()", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "subfunc()$0", kind: Function, lookup: "subfunc", @@ -1009,8 +1009,8 @@ mod tests { }, CompletionItem { label: "submethod()", - source_range: 219..219, - delete: 219..219, + source_range: 221..221, + delete: 221..221, insert: "submethod()$0", kind: Method, lookup: "submethod", @@ -1055,40 +1055,40 @@ mod tests { [ CompletionItem { label: "C2", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "C2", kind: Const, detail: "const C2: () = ();", }, CompletionItem { label: "CONST", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "CONST", kind: Const, detail: "const CONST: u8 = 0;", }, CompletionItem { label: "SubTy", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "SubTy", kind: TypeAlias, detail: "type SubTy;", }, CompletionItem { label: "Ty", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "Ty", kind: TypeAlias, detail: "type Ty;", }, CompletionItem { label: "func()", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "func()$0", kind: Function, lookup: "func", @@ -1096,8 +1096,8 @@ mod tests { }, CompletionItem { label: "method()", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "method()$0", kind: Method, lookup: "method", @@ -1105,8 +1105,8 @@ mod tests { }, CompletionItem { label: "subfunc()", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "subfunc()$0", kind: Function, lookup: "subfunc", @@ -1114,8 +1114,8 @@ mod tests { }, CompletionItem { label: "submethod()", - source_range: 365..365, - delete: 365..365, + source_range: 367..367, + delete: 367..367, insert: "submethod()$0", kind: Method, lookup: "submethod", diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs index 68032c37e..aa2b07a2f 100644 --- a/crates/ra_ide/src/completion/complete_unqualified_path.rs +++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs @@ -781,46 +781,46 @@ mod tests { [ CompletionItem { label: "bar!(…)", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "bar!($0)", kind: Macro, detail: "macro_rules! bar", }, CompletionItem { label: "baz!(…)", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "baz!($0)", kind: Macro, detail: "#[macro_export]\nmacro_rules! baz", }, CompletionItem { label: "foo!(…)", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "foo!($0)", kind: Macro, detail: "macro_rules! foo", }, CompletionItem { label: "m1", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "m1", kind: Module, }, CompletionItem { label: "m2", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "m2", kind: Module, }, CompletionItem { label: "main()", - source_range: 252..252, - delete: 252..252, + source_range: 256..256, + delete: 256..256, insert: "main()$0", kind: Function, lookup: "main", @@ -850,16 +850,16 @@ mod tests { [ CompletionItem { label: "foo!(…)", - source_range: 49..49, - delete: 49..49, + source_range: 50..50, + delete: 50..50, insert: "foo!($0)", kind: Macro, detail: "macro_rules! foo", }, CompletionItem { label: "foo()", - source_range: 49..49, - delete: 49..49, + source_range: 50..50, + delete: 50..50, insert: "foo()$0", kind: Function, lookup: "foo", @@ -889,16 +889,16 @@ mod tests { [ CompletionItem { label: "foo!(…)", - source_range: 57..57, - delete: 57..57, + source_range: 58..58, + delete: 58..58, insert: "foo!($0)", kind: Macro, detail: "macro_rules! foo", }, CompletionItem { label: "main()", - source_range: 57..57, - delete: 57..57, + source_range: 58..58, + delete: 58..58, insert: "main()$0", kind: Function, lookup: "main", @@ -928,16 +928,16 @@ mod tests { [ CompletionItem { label: "foo!(…)", - source_range: 50..50, - delete: 50..50, + source_range: 51..51, + delete: 51..51, insert: "foo!($0)", kind: Macro, detail: "macro_rules! foo", }, CompletionItem { label: "main()", - source_range: 50..50, - delete: 50..50, + source_range: 51..51, + delete: 51..51, insert: "main()$0", kind: Function, lookup: "main", -- cgit v1.2.3