aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-09-11 15:49:57 +0100
committerGitHub <[email protected]>2019-09-11 15:49:57 +0100
commit6ce6744e18f25ebcde387178125d820686692df5 (patch)
treee1861982356f9905980537f962dff9560423f901 /crates/ra_hir
parent7bbb039fbdd124cb6549eb67bbe7316f03ff40e8 (diff)
parent6353b1621f44e1b0db65ebbe414aa7c5f1864b9d (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_hir')
-rw-r--r--crates/ra_hir/src/nameres.rs2
-rw-r--r--crates/ra_hir/src/nameres/tests/macros.rs2
-rw-r--r--crates/ra_hir/src/ty/tests.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 7488d75a5..3d8691f53 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -416,7 +416,7 @@ impl CrateDefMap {
416 ); 416 );
417 } 417 }
418 418
419 // Since it is a quantified path here, it should not contains legacy macros 419 // Since it is a qualified path here, it should not contains legacy macros
420 match self[module.module_id].scope.get(&segment.name) { 420 match self[module.module_id].scope.get(&segment.name) {
421 Some(res) => res.def, 421 Some(res) => res.def,
422 _ => { 422 _ => {
diff --git a/crates/ra_hir/src/nameres/tests/macros.rs b/crates/ra_hir/src/nameres/tests/macros.rs
index 20ee63c67..6e0bc437e 100644
--- a/crates/ra_hir/src/nameres/tests/macros.rs
+++ b/crates/ra_hir/src/nameres/tests/macros.rs
@@ -430,7 +430,7 @@ fn macro_use_can_be_aliased() {
430} 430}
431 431
432#[test] 432#[test]
433fn path_quantified_macros() { 433fn path_qualified_macros() {
434 let map = def_map( 434 let map = def_map(
435 " 435 "
436 //- /main.rs 436 //- /main.rs
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index c60e72abf..869ae13f1 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -2839,7 +2839,7 @@ fn main() {
2839} 2839}
2840 2840
2841#[test] 2841#[test]
2842fn infer_path_quantified_macros_expanded() { 2842fn infer_path_qualified_macros_expanded() {
2843 assert_snapshot!( 2843 assert_snapshot!(
2844 infer(r#" 2844 infer(r#"
2845#[macro_export] 2845#[macro_export]