aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml14
-rw-r--r--README.md1
-rw-r--r--crates/ra_assists/src/add_missing_impl_members.rs123
-rw-r--r--crates/ra_assists/src/lib.rs1
-rw-r--r--crates/ra_parser/src/grammar/types.rs3
-rw-r--r--crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs2
-rw-r--r--crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt126
7 files changed, 245 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml
index 8d10a43f0..ebff7d8b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,15 @@ build: &rust_build
12 - rustup component add rust-src 12 - rustup component add rust-src
13 - cargo test --no-run # let's measure compile time separately 13 - cargo test --no-run # let's measure compile time separately
14 - cargo test 14 - cargo test
15 - cargo doc --all --no-deps
15 env: 16 env:
16 - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0 17 - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0
17 18
18matrix: 19matrix:
19 include: 20 include:
20 - os: linux 21 - os: linux
22 before_script:
23 - DEPLOY_DOCS=1
21 <<: *rust_build 24 <<: *rust_build
22 - language: node_js 25 - language: node_js
23 node_js: node 26 node_js: node
@@ -43,3 +46,14 @@ branches:
43 - staging 46 - staging
44 - master 47 - master
45 - trying 48 - trying
49
50deploy:
51 provider: pages
52 skip-cleanup: true
53 github-token: $DOCS_TOKEN # Set in the settings page of your repository, as a secure variable
54 keep-history: true
55 local-dir: target/doc
56 branch: gh-pages
57 on:
58 branch: master
59 condition: $DEPLOY_DOCS = 1
diff --git a/README.md b/README.md
index 3a0c9dee1..7c81413d9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
1# Rust Analyzer 1# Rust Analyzer
2 2
3[![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer) 3[![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer)
4[![Master docs](https://img.shields.io/badge/docs-master-blue.svg)](https://rust-analyzer.github.io/rust-analyzer/ra_ide_api/index.html)
4 5
5Rust Analyzer is an **experimental** modular compiler frontend for the Rust 6Rust Analyzer is an **experimental** modular compiler frontend for the Rust
6language. It is a part of a larger rls-2.0 effort to create excellent IDE 7language. It is a part of a larger rls-2.0 effort to create excellent IDE
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs
index 4435c4b5d..e13f54c4f 100644
--- a/crates/ra_assists/src/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/add_missing_impl_members.rs
@@ -9,7 +9,35 @@ use ra_fmt::{leading_indent, reindent};
9 9
10use itertools::Itertools; 10use itertools::Itertools;
11 11
12pub(crate) fn add_missing_impl_members(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> { 12enum AddMissingImplMembersMode {
13 DefaultMethodsOnly,
14 NoDefaultMethods,
15}
16
17pub(crate) fn add_missing_impl_members(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
18 add_missing_impl_members_inner(
19 ctx,
20 AddMissingImplMembersMode::NoDefaultMethods,
21 "add_impl_missing_members",
22 "add missing impl members",
23 )
24}
25
26pub(crate) fn add_missing_default_members(ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
27 add_missing_impl_members_inner(
28 ctx,
29 AddMissingImplMembersMode::DefaultMethodsOnly,
30 "add_impl_default_members",
31 "add impl default members",
32 )
33}
34
35fn add_missing_impl_members_inner(
36 mut ctx: AssistCtx<impl HirDatabase>,
37 mode: AddMissingImplMembersMode,
38 assist_id: &'static str,
39 label: &'static str,
40) -> Option<Assist> {
13 let impl_node = ctx.node_at_offset::<ast::ImplBlock>()?; 41 let impl_node = ctx.node_at_offset::<ast::ImplBlock>()?;
14 let impl_item_list = impl_node.item_list()?; 42 let impl_item_list = impl_node.item_list()?;
15 43
@@ -35,6 +63,10 @@ pub(crate) fn add_missing_impl_members(mut ctx: AssistCtx<impl HirDatabase>) ->
35 trait_fns 63 trait_fns
36 .into_iter() 64 .into_iter()
37 .filter(|t| def_name(t).is_some()) 65 .filter(|t| def_name(t).is_some())
66 .filter(|t| match mode {
67 AddMissingImplMembersMode::DefaultMethodsOnly => t.body().is_some(),
68 AddMissingImplMembersMode::NoDefaultMethods => t.body().is_none(),
69 })
38 .filter(|t| impl_fns.iter().all(|i| def_name(i) != def_name(t))) 70 .filter(|t| impl_fns.iter().all(|i| def_name(i) != def_name(t)))
39 .collect() 71 .collect()
40 }; 72 };
@@ -42,7 +74,7 @@ pub(crate) fn add_missing_impl_members(mut ctx: AssistCtx<impl HirDatabase>) ->
42 return None; 74 return None;
43 } 75 }
44 76
45 ctx.add_action(AssistId("add_impl_missing_members"), "add missing impl members", |edit| { 77 ctx.add_action(AssistId(assist_id), label, |edit| {
46 let (parent_indent, indent) = { 78 let (parent_indent, indent) = {
47 // FIXME: Find a way to get the indent already used in the file. 79 // FIXME: Find a way to get the indent already used in the file.
48 // Now, we copy the indent of first item or indent with 4 spaces relative to impl block 80 // Now, we copy the indent of first item or indent with 4 spaces relative to impl block
@@ -103,11 +135,13 @@ fn build_func_body(def: &ast::FnDef) -> String {
103 let mut buf = String::new(); 135 let mut buf = String::new();
104 136
105 for child in def.syntax().children() { 137 for child in def.syntax().children() {
106 if child.kind() == SyntaxKind::SEMI { 138 match (child.prev_sibling().map(|c| c.kind()), child.kind()) {
107 buf.push_str(" { unimplemented!() }") 139 (_, SyntaxKind::SEMI) => buf.push_str(" { unimplemented!() }"),
108 } else { 140 (_, SyntaxKind::ATTR) | (_, SyntaxKind::COMMENT) => {}
109 child.text().push_to(&mut buf); 141 (Some(SyntaxKind::ATTR), SyntaxKind::WHITESPACE)
110 } 142 | (Some(SyntaxKind::COMMENT), SyntaxKind::WHITESPACE) => {}
143 _ => child.text().push_to(&mut buf),
144 };
111 } 145 }
112 146
113 buf.trim_end().to_string() 147 buf.trim_end().to_string()
@@ -180,8 +214,7 @@ struct S;
180 214
181impl Foo for S { 215impl Foo for S {
182 fn bar(&self) {} 216 fn bar(&self) {}
183 fn foo(&self) { unimplemented!() } 217 fn foo(&self) { unimplemented!() }<|>
184 fn baz(&self) -> u32 { 42 }<|>
185}", 218}",
186 ); 219 );
187 } 220 }
@@ -193,7 +226,7 @@ impl Foo for S {
193 " 226 "
194trait Foo { fn foo(&self); } 227trait Foo { fn foo(&self); }
195struct S; 228struct S;
196impl Foo for S {<|>}", 229impl Foo for S { <|> }",
197 " 230 "
198trait Foo { fn foo(&self); } 231trait Foo { fn foo(&self); }
199struct S; 232struct S;
@@ -232,8 +265,8 @@ impl Foo for S { <|> }",
232 } 265 }
233 266
234 #[test] 267 #[test]
235 fn test_ignore_unnamed_trait_members() { 268 fn test_ignore_unnamed_trait_members_and_default_methods() {
236 check_assist( 269 check_assist_not_applicable(
237 add_missing_impl_members, 270 add_missing_impl_members,
238 " 271 "
239trait Foo { 272trait Foo {
@@ -242,15 +275,6 @@ trait Foo {
242} 275}
243struct S; 276struct S;
244impl Foo for S { <|> }", 277impl Foo for S { <|> }",
245 "
246trait Foo {
247 fn (arg: u32);
248 fn valid(some: u32) -> bool { false }
249}
250struct S;
251impl Foo for S {
252 fn valid(some: u32) -> bool { false }<|>
253}",
254 ) 278 )
255 } 279 }
256 280
@@ -260,7 +284,7 @@ impl Foo for S {
260 add_missing_impl_members, 284 add_missing_impl_members,
261 " 285 "
262trait Foo { 286trait Foo {
263 fn valid(some: u32) -> bool { false } 287 fn valid(some: u32) -> bool;
264} 288}
265struct S; 289struct S;
266 290
@@ -269,15 +293,66 @@ mod my_mod {
269}", 293}",
270 " 294 "
271trait Foo { 295trait Foo {
272 fn valid(some: u32) -> bool { false } 296 fn valid(some: u32) -> bool;
273} 297}
274struct S; 298struct S;
275 299
276mod my_mod { 300mod my_mod {
277 impl crate::Foo for S { 301 impl crate::Foo for S {
278 fn valid(some: u32) -> bool { false }<|> 302 fn valid(some: u32) -> bool { unimplemented!() }<|>
303 }
304}",
305 )
306 }
307
308 #[test]
309 fn test_with_docstring_and_attrs() {
310 check_assist(
311 add_missing_impl_members,
312 r#"
313#[doc(alias = "test alias")]
314trait Foo {
315 /// doc string
316 #[must_use]
317 fn foo(&self);
318}
319struct S;
320impl Foo for S {}<|>"#,
321 r#"
322#[doc(alias = "test alias")]
323trait Foo {
324 /// doc string
325 #[must_use]
326 fn foo(&self);
327}
328struct S;
329impl Foo for S {
330 fn foo(&self) { unimplemented!() }<|>
331}"#,
332 )
279 } 333 }
334
335 #[test]
336 fn test_default_methods() {
337 check_assist(
338 add_missing_default_members,
339 "
340trait Foo {
341 fn valid(some: u32) -> bool { false }
342 fn foo(some: u32) -> bool;
343}
344struct S;
345impl Foo for S { <|> }",
346 "
347trait Foo {
348 fn valid(some: u32) -> bool { false }
349 fn foo(some: u32) -> bool;
350}
351struct S;
352impl Foo for S {
353 fn valid(some: u32) -> bool { false }<|>
280}", 354}",
281 ) 355 )
282 } 356 }
357
283} 358}
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index eb5248ae4..8900fbc4b 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -114,6 +114,7 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis
114 remove_dbg::remove_dbg, 114 remove_dbg::remove_dbg,
115 auto_import::auto_import, 115 auto_import::auto_import,
116 add_missing_impl_members::add_missing_impl_members, 116 add_missing_impl_members::add_missing_impl_members,
117 add_missing_impl_members::add_missing_default_members,
117 ] 118 ]
118} 119}
119 120
diff --git a/crates/ra_parser/src/grammar/types.rs b/crates/ra_parser/src/grammar/types.rs
index adc189a29..fdd4f2c52 100644
--- a/crates/ra_parser/src/grammar/types.rs
+++ b/crates/ra_parser/src/grammar/types.rs
@@ -202,12 +202,15 @@ pub(super) fn for_binder(p: &mut Parser) {
202 202
203// test for_type 203// test for_type
204// type A = for<'a> fn() -> (); 204// type A = for<'a> fn() -> ();
205// fn foo<T>(_t: &T) where for<'a> &'a T: Iterator {}
206// fn bar<T>(_t: &T) where for<'a> &'a mut T: Iterator {}
205pub(super) fn for_type(p: &mut Parser) { 207pub(super) fn for_type(p: &mut Parser) {
206 assert!(p.at(FOR_KW)); 208 assert!(p.at(FOR_KW));
207 let m = p.start(); 209 let m = p.start();
208 for_binder(p); 210 for_binder(p);
209 match p.current() { 211 match p.current() {
210 FN_KW | UNSAFE_KW | EXTERN_KW => fn_pointer_type(p), 212 FN_KW | UNSAFE_KW | EXTERN_KW => fn_pointer_type(p),
213 AMP => reference_type(p),
211 _ if paths::is_path_start(p) => path_type_(p, false), 214 _ if paths::is_path_start(p) => path_type_(p, false),
212 _ => p.error("expected a path"), 215 _ => p.error("expected a path"),
213 } 216 }
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
index 4d6a18c6b..7cde5c532 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.rs
@@ -1 +1,3 @@
1type A = for<'a> fn() -> (); 1type A = for<'a> fn() -> ();
2fn foo<T>(_t: &T) where for<'a> &'a T: Iterator {}
3fn bar<T>(_t: &T) where for<'a> &'a mut T: Iterator {}
diff --git a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
index 6e7e6bda1..568f61fb2 100644
--- a/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
+++ b/crates/ra_syntax/tests/data/parser/inline/ok/0081_for_type.txt
@@ -1,4 +1,4 @@
1SOURCE_FILE@[0; 29) 1SOURCE_FILE@[0; 135)
2 TYPE_ALIAS_DEF@[0; 28) 2 TYPE_ALIAS_DEF@[0; 28)
3 TYPE_KW@[0; 4) 3 TYPE_KW@[0; 4)
4 WHITESPACE@[4; 5) 4 WHITESPACE@[4; 5)
@@ -29,3 +29,127 @@ SOURCE_FILE@[0; 29)
29 R_PAREN@[26; 27) 29 R_PAREN@[26; 27)
30 SEMI@[27; 28) 30 SEMI@[27; 28)
31 WHITESPACE@[28; 29) 31 WHITESPACE@[28; 29)
32 FN_DEF@[29; 79)
33 FN_KW@[29; 31)
34 WHITESPACE@[31; 32)
35 NAME@[32; 35)
36 IDENT@[32; 35) "foo"
37 TYPE_PARAM_LIST@[35; 38)
38 L_ANGLE@[35; 36)
39 TYPE_PARAM@[36; 37)
40 NAME@[36; 37)
41 IDENT@[36; 37) "T"
42 R_ANGLE@[37; 38)
43 PARAM_LIST@[38; 46)
44 L_PAREN@[38; 39)
45 PARAM@[39; 45)
46 BIND_PAT@[39; 41)
47 NAME@[39; 41)
48 IDENT@[39; 41) "_t"
49 COLON@[41; 42)
50 WHITESPACE@[42; 43)
51 REFERENCE_TYPE@[43; 45)
52 AMP@[43; 44)
53 PATH_TYPE@[44; 45)
54 PATH@[44; 45)
55 PATH_SEGMENT@[44; 45)
56 NAME_REF@[44; 45)
57 IDENT@[44; 45) "T"
58 R_PAREN@[45; 46)
59 WHITESPACE@[46; 47)
60 WHERE_CLAUSE@[47; 76)
61 WHERE_KW@[47; 52)
62 WHITESPACE@[52; 53)
63 WHERE_PRED@[53; 76)
64 FOR_TYPE@[53; 66)
65 FOR_KW@[53; 56)
66 TYPE_PARAM_LIST@[56; 60)
67 L_ANGLE@[56; 57)
68 LIFETIME_PARAM@[57; 59)
69 LIFETIME@[57; 59) "'a"
70 R_ANGLE@[59; 60)
71 WHITESPACE@[60; 61)
72 REFERENCE_TYPE@[61; 66)
73 AMP@[61; 62)
74 LIFETIME@[62; 64) "'a"
75 WHITESPACE@[64; 65)
76 PATH_TYPE@[65; 66)
77 PATH@[65; 66)
78 PATH_SEGMENT@[65; 66)
79 NAME_REF@[65; 66)
80 IDENT@[65; 66) "T"
81 COLON@[66; 67)
82 WHITESPACE@[67; 68)
83 PATH_TYPE@[68; 76)
84 PATH@[68; 76)
85 PATH_SEGMENT@[68; 76)
86 NAME_REF@[68; 76)
87 IDENT@[68; 76) "Iterator"
88 WHITESPACE@[76; 77)
89 BLOCK@[77; 79)
90 L_CURLY@[77; 78)
91 R_CURLY@[78; 79)
92 WHITESPACE@[79; 80)
93 FN_DEF@[80; 134)
94 FN_KW@[80; 82)
95 WHITESPACE@[82; 83)
96 NAME@[83; 86)
97 IDENT@[83; 86) "bar"
98 TYPE_PARAM_LIST@[86; 89)
99 L_ANGLE@[86; 87)
100 TYPE_PARAM@[87; 88)
101 NAME@[87; 88)
102 IDENT@[87; 88) "T"
103 R_ANGLE@[88; 89)
104 PARAM_LIST@[89; 97)
105 L_PAREN@[89; 90)
106 PARAM@[90; 96)
107 BIND_PAT@[90; 92)
108 NAME@[90; 92)
109 IDENT@[90; 92) "_t"
110 COLON@[92; 93)
111 WHITESPACE@[93; 94)
112 REFERENCE_TYPE@[94; 96)
113 AMP@[94; 95)
114 PATH_TYPE@[95; 96)
115 PATH@[95; 96)
116 PATH_SEGMENT@[95; 96)
117 NAME_REF@[95; 96)
118 IDENT@[95; 96) "T"
119 R_PAREN@[96; 97)
120 WHITESPACE@[97; 98)
121 WHERE_CLAUSE@[98; 131)
122 WHERE_KW@[98; 103)
123 WHITESPACE@[103; 104)
124 WHERE_PRED@[104; 131)
125 FOR_TYPE@[104; 121)
126 FOR_KW@[104; 107)
127 TYPE_PARAM_LIST@[107; 111)
128 L_ANGLE@[107; 108)
129 LIFETIME_PARAM@[108; 110)
130 LIFETIME@[108; 110) "'a"
131 R_ANGLE@[110; 111)
132 WHITESPACE@[111; 112)
133 REFERENCE_TYPE@[112; 121)
134 AMP@[112; 113)
135 LIFETIME@[113; 115) "'a"
136 WHITESPACE@[115; 116)
137 MUT_KW@[116; 119)
138 WHITESPACE@[119; 120)
139 PATH_TYPE@[120; 121)
140 PATH@[120; 121)
141 PATH_SEGMENT@[120; 121)
142 NAME_REF@[120; 121)
143 IDENT@[120; 121) "T"
144 COLON@[121; 122)
145 WHITESPACE@[122; 123)
146 PATH_TYPE@[123; 131)
147 PATH@[123; 131)
148 PATH_SEGMENT@[123; 131)
149 NAME_REF@[123; 131)
150 IDENT@[123; 131) "Iterator"
151 WHITESPACE@[131; 132)
152 BLOCK@[132; 134)
153 L_CURLY@[132; 133)
154 R_CURLY@[133; 134)
155 WHITESPACE@[134; 135)