diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-12 11:45:47 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-12 11:45:47 +0100 |
commit | 561e7aea5bdaf6c51e0a87da9ff1d73e2df52be1 (patch) | |
tree | acb43ce2f904a5e79af45ff0706b9f69a273d210 /crates/ra_ide_api/src/completion/complete_path.rs | |
parent | dfcbdcb9a3a329686eedfc18518c675a6f80f338 (diff) | |
parent | 9c2a3da67cee6f941b4ad77bdb2b7552c8afdb7f (diff) |
Merge #1821
1821: Macro completion tweaks r=matklad a=SomeoneToIgnore
Thanks @uHOOCCOOHu for making the macro completion happen :)
I've added a few tweaks to the current completion to make it a bit more convenient:
* Automatically add braces and put the editor cursor inside of them:
<img width="159" alt="image" src="https://user-images.githubusercontent.com/2690773/64737220-022b9f00-d4f5-11e9-8088-76d4678921ab.png">
Currently I have to add the braces manually which is a bit cumbersome.
One further improvement can be to detect if macro accepts no parameters and place the cursor differently for this case.
* Add an exclamation mark to the macro completion label
This helps to distinguish macros from other completion items and also allows to show only macros in completion if you type `!`:
<img width="722" alt="image" src="https://user-images.githubusercontent.com/2690773/64736987-8b8ea180-d4f4-11e9-8355-2ce4f83b7aa8.png">
<img width="732" alt="image" src="https://user-images.githubusercontent.com/2690773/64737214-ffc94500-d4f4-11e9-946e-1ba2db1c7fb1.png">
Additionally, automatic formatting hooks had adjusted two `help.rs` files, I've added them as a last commit to the PR even though they are not really related.
Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/completion/complete_path.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion/complete_path.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs index 31e7dffe8..457a3d10c 100644 --- a/crates/ra_ide_api/src/completion/complete_path.rs +++ b/crates/ra_ide_api/src/completion/complete_path.rs | |||
@@ -605,10 +605,10 @@ mod tests { | |||
605 | ), | 605 | ), |
606 | @r###"[ | 606 | @r###"[ |
607 | CompletionItem { | 607 | CompletionItem { |
608 | label: "foo", | 608 | label: "foo!", |
609 | source_range: [179; 179), | 609 | source_range: [179; 179), |
610 | delete: [179; 179), | 610 | delete: [179; 179), |
611 | insert: "foo!", | 611 | insert: "foo!($0)", |
612 | kind: Macro, | 612 | kind: Macro, |
613 | detail: "#[macro_export]\nmacro_rules! foo", | 613 | detail: "#[macro_export]\nmacro_rules! foo", |
614 | }, | 614 | }, |