diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-11 15:49:57 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-11 15:49:57 +0100 |
commit | 6ce6744e18f25ebcde387178125d820686692df5 (patch) | |
tree | e1861982356f9905980537f962dff9560423f901 /crates/ra_ide_api/src/completion.rs | |
parent | 7bbb039fbdd124cb6549eb67bbe7316f03ff40e8 (diff) | |
parent | 6353b1621f44e1b0db65ebbe414aa7c5f1864b9d (diff) |
Merge #1796
1796: Support completion for macros r=matklad a=uHOOCCOOHu
This is based on #1795 , and fixes #1727
Also prettify hover text of macros.
Some screenshorts below:
Completion in item place.
<img width="416" alt="Screenshot_20190910_134056" src="https://user-images.githubusercontent.com/14816024/64587159-fa72da00-d3d0-11e9-86bb-c98f169ec08d.png">
After pressing `tab`.
<img width="313" alt="Screenshot_20190910_134111" src="https://user-images.githubusercontent.com/14816024/64587160-fa72da00-d3d0-11e9-9464-21e3f6957bd7.png">
Complete macros from `std`.
<img width="588" alt="Screenshot_20190910_134147" src="https://user-images.githubusercontent.com/14816024/64587161-fb0b7080-d3d0-11e9-866e-5161f0d1b546.png">
Hover text.
<img width="521" alt="Screenshot_20190910_134242" src="https://user-images.githubusercontent.com/14816024/64587162-fb0b7080-d3d0-11e9-8f09-ad17e3f6702a.png">
Co-authored-by: uHOOCCOOHu <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/completion.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_ide_api/src/completion.rs b/crates/ra_ide_api/src/completion.rs index a4f080adc..0ad414831 100644 --- a/crates/ra_ide_api/src/completion.rs +++ b/crates/ra_ide_api/src/completion.rs | |||
@@ -12,6 +12,7 @@ mod complete_snippet; | |||
12 | mod complete_path; | 12 | mod complete_path; |
13 | mod complete_scope; | 13 | mod complete_scope; |
14 | mod complete_postfix; | 14 | mod complete_postfix; |
15 | mod complete_macro_in_item_position; | ||
15 | 16 | ||
16 | use ra_db::SourceDatabase; | 17 | use ra_db::SourceDatabase; |
17 | 18 | ||
@@ -69,5 +70,6 @@ pub(crate) fn completions(db: &db::RootDatabase, position: FilePosition) -> Opti | |||
69 | complete_record_pattern::complete_record_pattern(&mut acc, &ctx); | 70 | complete_record_pattern::complete_record_pattern(&mut acc, &ctx); |
70 | complete_pattern::complete_pattern(&mut acc, &ctx); | 71 | complete_pattern::complete_pattern(&mut acc, &ctx); |
71 | complete_postfix::complete_postfix(&mut acc, &ctx); | 72 | complete_postfix::complete_postfix(&mut acc, &ctx); |
73 | complete_macro_in_item_position::complete_macro_in_item_position(&mut acc, &ctx); | ||
72 | Some(acc) | 74 | Some(acc) |
73 | } | 75 | } |