diff options
Diffstat (limited to 'crates/ide')
22 files changed, 702 insertions, 946 deletions
diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs index 8ad50a2ee..60e0cd4ad 100644 --- a/crates/ide/src/call_hierarchy.rs +++ b/crates/ide/src/call_hierarchy.rs | |||
@@ -181,8 +181,8 @@ fn caller() { | |||
181 | call<|>ee(); | 181 | call<|>ee(); |
182 | } | 182 | } |
183 | "#, | 183 | "#, |
184 | "callee FN FileId(0) 0..14 3..9", | 184 | "callee Function FileId(0) 0..14 3..9", |
185 | &["caller FN FileId(0) 15..44 18..24 : [33..39]"], | 185 | &["caller Function FileId(0) 15..44 18..24 : [33..39]"], |
186 | &[], | 186 | &[], |
187 | ); | 187 | ); |
188 | } | 188 | } |
@@ -197,8 +197,8 @@ fn caller() { | |||
197 | callee(); | 197 | callee(); |
198 | } | 198 | } |
199 | "#, | 199 | "#, |
200 | "callee FN FileId(0) 0..14 3..9", | 200 | "callee Function FileId(0) 0..14 3..9", |
201 | &["caller FN FileId(0) 15..44 18..24 : [33..39]"], | 201 | &["caller Function FileId(0) 15..44 18..24 : [33..39]"], |
202 | &[], | 202 | &[], |
203 | ); | 203 | ); |
204 | } | 204 | } |
@@ -214,8 +214,8 @@ fn caller() { | |||
214 | callee(); | 214 | callee(); |
215 | } | 215 | } |
216 | "#, | 216 | "#, |
217 | "callee FN FileId(0) 0..14 3..9", | 217 | "callee Function FileId(0) 0..14 3..9", |
218 | &["caller FN FileId(0) 15..58 18..24 : [33..39, 47..53]"], | 218 | &["caller Function FileId(0) 15..58 18..24 : [33..39, 47..53]"], |
219 | &[], | 219 | &[], |
220 | ); | 220 | ); |
221 | } | 221 | } |
@@ -234,10 +234,10 @@ fn caller2() { | |||
234 | callee(); | 234 | callee(); |
235 | } | 235 | } |
236 | "#, | 236 | "#, |
237 | "callee FN FileId(0) 0..14 3..9", | 237 | "callee Function FileId(0) 0..14 3..9", |
238 | &[ | 238 | &[ |
239 | "caller1 FN FileId(0) 15..45 18..25 : [34..40]", | 239 | "caller1 Function FileId(0) 15..45 18..25 : [34..40]", |
240 | "caller2 FN FileId(0) 47..77 50..57 : [66..72]", | 240 | "caller2 Function FileId(0) 47..77 50..57 : [66..72]", |
241 | ], | 241 | ], |
242 | &[], | 242 | &[], |
243 | ); | 243 | ); |
@@ -263,10 +263,10 @@ mod tests { | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | "#, | 265 | "#, |
266 | "callee FN FileId(0) 0..14 3..9", | 266 | "callee Function FileId(0) 0..14 3..9", |
267 | &[ | 267 | &[ |
268 | "caller1 FN FileId(0) 15..45 18..25 : [34..40]", | 268 | "caller1 Function FileId(0) 15..45 18..25 : [34..40]", |
269 | "test_caller FN FileId(0) 95..149 110..121 : [134..140]", | 269 | "test_caller Function FileId(0) 95..149 110..121 : [134..140]", |
270 | ], | 270 | ], |
271 | &[], | 271 | &[], |
272 | ); | 272 | ); |
@@ -287,8 +287,8 @@ fn caller() { | |||
287 | //- /foo/mod.rs | 287 | //- /foo/mod.rs |
288 | pub fn callee() {} | 288 | pub fn callee() {} |
289 | "#, | 289 | "#, |
290 | "callee FN FileId(1) 0..18 7..13", | 290 | "callee Function FileId(1) 0..18 7..13", |
291 | &["caller FN FileId(0) 27..56 30..36 : [45..51]"], | 291 | &["caller Function FileId(0) 27..56 30..36 : [45..51]"], |
292 | &[], | 292 | &[], |
293 | ); | 293 | ); |
294 | } | 294 | } |
@@ -304,9 +304,9 @@ fn call<|>er() { | |||
304 | callee(); | 304 | callee(); |
305 | } | 305 | } |
306 | "#, | 306 | "#, |
307 | "caller FN FileId(0) 15..58 18..24", | 307 | "caller Function FileId(0) 15..58 18..24", |
308 | &[], | 308 | &[], |
309 | &["callee FN FileId(0) 0..14 3..9 : [33..39, 47..53]"], | 309 | &["callee Function FileId(0) 0..14 3..9 : [33..39, 47..53]"], |
310 | ); | 310 | ); |
311 | } | 311 | } |
312 | 312 | ||
@@ -325,9 +325,9 @@ fn call<|>er() { | |||
325 | //- /foo/mod.rs | 325 | //- /foo/mod.rs |
326 | pub fn callee() {} | 326 | pub fn callee() {} |
327 | "#, | 327 | "#, |
328 | "caller FN FileId(0) 27..56 30..36", | 328 | "caller Function FileId(0) 27..56 30..36", |
329 | &[], | 329 | &[], |
330 | &["callee FN FileId(1) 0..18 7..13 : [45..51]"], | 330 | &["callee Function FileId(1) 0..18 7..13 : [45..51]"], |
331 | ); | 331 | ); |
332 | } | 332 | } |
333 | 333 | ||
@@ -348,9 +348,9 @@ fn caller3() { | |||
348 | 348 | ||
349 | } | 349 | } |
350 | "#, | 350 | "#, |
351 | "caller2 FN FileId(0) 33..64 36..43", | 351 | "caller2 Function FileId(0) 33..64 36..43", |
352 | &["caller1 FN FileId(0) 0..31 3..10 : [19..26]"], | 352 | &["caller1 Function FileId(0) 0..31 3..10 : [19..26]"], |
353 | &["caller3 FN FileId(0) 66..83 69..76 : [52..59]"], | 353 | &["caller3 Function FileId(0) 66..83 69..76 : [52..59]"], |
354 | ); | 354 | ); |
355 | } | 355 | } |
356 | 356 | ||
@@ -368,9 +368,9 @@ fn main() { | |||
368 | a<|>() | 368 | a<|>() |
369 | } | 369 | } |
370 | "#, | 370 | "#, |
371 | "a FN FileId(0) 0..18 3..4", | 371 | "a Function FileId(0) 0..18 3..4", |
372 | &["main FN FileId(0) 31..52 34..38 : [47..48]"], | 372 | &["main Function FileId(0) 31..52 34..38 : [47..48]"], |
373 | &["b FN FileId(0) 20..29 23..24 : [13..14]"], | 373 | &["b Function FileId(0) 20..29 23..24 : [13..14]"], |
374 | ); | 374 | ); |
375 | 375 | ||
376 | check_hierarchy( | 376 | check_hierarchy( |
@@ -385,8 +385,8 @@ fn main() { | |||
385 | a() | 385 | a() |
386 | } | 386 | } |
387 | "#, | 387 | "#, |
388 | "b FN FileId(0) 20..29 23..24", | 388 | "b Function FileId(0) 20..29 23..24", |
389 | &["a FN FileId(0) 0..18 3..4 : [13..14]"], | 389 | &["a Function FileId(0) 0..18 3..4 : [13..14]"], |
390 | &[], | 390 | &[], |
391 | ); | 391 | ); |
392 | } | 392 | } |
diff --git a/crates/ide/src/diagnostics/fixes.rs b/crates/ide/src/diagnostics/fixes.rs index 13240672f..e8b896623 100644 --- a/crates/ide/src/diagnostics/fixes.rs +++ b/crates/ide/src/diagnostics/fixes.rs | |||
@@ -166,7 +166,7 @@ fn missing_record_expr_field_fix( | |||
166 | def_file_id = source.file_id; | 166 | def_file_id = source.file_id; |
167 | source.value.record_field_list()? | 167 | source.value.record_field_list()? |
168 | } | 168 | } |
169 | VariantDef::EnumVariant(e) => { | 169 | VariantDef::Variant(e) => { |
170 | module = e.module(sema.db); | 170 | module = e.module(sema.db); |
171 | let source = e.source(sema.db); | 171 | let source = e.source(sema.db); |
172 | def_file_id = source.file_id; | 172 | def_file_id = source.file_id; |
diff --git a/crates/ide/src/display.rs b/crates/ide/src/display.rs index 0650915c5..bae9e40df 100644 --- a/crates/ide/src/display.rs +++ b/crates/ide/src/display.rs | |||
@@ -1,10 +1,9 @@ | |||
1 | //! This module contains utilities for turning SyntaxNodes and HIR types | 1 | //! This module contains utilities for turning SyntaxNodes and HIR types |
2 | //! into types that may be used to render in a UI. | 2 | //! into types that may be used to render in a UI. |
3 | 3 | ||
4 | mod navigation_target; | 4 | pub(crate) mod navigation_target; |
5 | mod short_label; | 5 | mod short_label; |
6 | 6 | ||
7 | pub use navigation_target::NavigationTarget; | ||
8 | pub(crate) use navigation_target::{ToNav, TryToNav}; | 7 | pub(crate) use navigation_target::{ToNav, TryToNav}; |
9 | pub(crate) use short_label::ShortLabel; | 8 | pub(crate) use short_label::ShortLabel; |
10 | 9 | ||
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index 54b33a98e..cd8ec54fa 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs | |||
@@ -1,28 +1,51 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! FIXME: write short doc here |
2 | 2 | ||
3 | use std::fmt; | ||
4 | |||
3 | use either::Either; | 5 | use either::Either; |
4 | use hir::{ | 6 | use hir::{AssocItem, Documentation, FieldSource, HasAttrs, HasSource, InFile, ModuleSource}; |
5 | AssocItem, Documentation, FieldSource, HasAttrs, HasSource, HirFileId, InFile, ModuleSource, | 7 | use ide_db::{ |
8 | base_db::{FileId, SourceDatabase}, | ||
9 | symbol_index::FileSymbolKind, | ||
6 | }; | 10 | }; |
7 | use ide_db::base_db::{FileId, SourceDatabase}; | ||
8 | use ide_db::{defs::Definition, RootDatabase}; | 11 | use ide_db::{defs::Definition, RootDatabase}; |
9 | use syntax::{ | 12 | use syntax::{ |
10 | ast::{self, NameOwner}, | 13 | ast::{self, NameOwner}, |
11 | match_ast, AstNode, SmolStr, | 14 | match_ast, AstNode, SmolStr, TextRange, |
12 | SyntaxKind::{self, IDENT_PAT, LIFETIME_PARAM, TYPE_PARAM}, | ||
13 | TextRange, | ||
14 | }; | 15 | }; |
15 | 16 | ||
16 | use crate::FileSymbol; | 17 | use crate::FileSymbol; |
17 | 18 | ||
18 | use super::short_label::ShortLabel; | 19 | use super::short_label::ShortLabel; |
19 | 20 | ||
21 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] | ||
22 | pub enum SymbolKind { | ||
23 | Module, | ||
24 | Impl, | ||
25 | Field, | ||
26 | TypeParam, | ||
27 | LifetimeParam, | ||
28 | ValueParam, | ||
29 | SelfParam, | ||
30 | Local, | ||
31 | Function, | ||
32 | Const, | ||
33 | Static, | ||
34 | Struct, | ||
35 | Enum, | ||
36 | Variant, | ||
37 | Union, | ||
38 | TypeAlias, | ||
39 | Trait, | ||
40 | Macro, | ||
41 | } | ||
42 | |||
20 | /// `NavigationTarget` represents and element in the editor's UI which you can | 43 | /// `NavigationTarget` represents and element in the editor's UI which you can |
21 | /// click on to navigate to a particular piece of code. | 44 | /// click on to navigate to a particular piece of code. |
22 | /// | 45 | /// |
23 | /// Typically, a `NavigationTarget` corresponds to some element in the source | 46 | /// Typically, a `NavigationTarget` corresponds to some element in the source |
24 | /// code, like a function or a struct, but this is not strictly required. | 47 | /// code, like a function or a struct, but this is not strictly required. |
25 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 48 | #[derive(Clone, PartialEq, Eq, Hash)] |
26 | pub struct NavigationTarget { | 49 | pub struct NavigationTarget { |
27 | pub file_id: FileId, | 50 | pub file_id: FileId, |
28 | /// Range which encompasses the whole element. | 51 | /// Range which encompasses the whole element. |
@@ -42,12 +65,30 @@ pub struct NavigationTarget { | |||
42 | /// Clients should place the cursor on this range when navigating to this target. | 65 | /// Clients should place the cursor on this range when navigating to this target. |
43 | pub focus_range: Option<TextRange>, | 66 | pub focus_range: Option<TextRange>, |
44 | pub name: SmolStr, | 67 | pub name: SmolStr, |
45 | pub kind: SyntaxKind, | 68 | pub kind: Option<SymbolKind>, |
46 | pub container_name: Option<SmolStr>, | 69 | pub container_name: Option<SmolStr>, |
47 | pub description: Option<String>, | 70 | pub description: Option<String>, |
48 | pub docs: Option<Documentation>, | 71 | pub docs: Option<Documentation>, |
49 | } | 72 | } |
50 | 73 | ||
74 | impl fmt::Debug for NavigationTarget { | ||
75 | fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
76 | let mut f = f.debug_struct("NavigationTarget"); | ||
77 | macro_rules! opt { | ||
78 | ($($name:ident)*) => {$( | ||
79 | if let Some(it) = &self.$name { | ||
80 | f.field(stringify!($name), it); | ||
81 | } | ||
82 | )*} | ||
83 | } | ||
84 | f.field("file_id", &self.file_id).field("full_range", &self.full_range); | ||
85 | opt!(focus_range); | ||
86 | f.field("name", &self.name); | ||
87 | opt!(kind container_name description docs); | ||
88 | f.finish() | ||
89 | } | ||
90 | } | ||
91 | |||
51 | pub(crate) trait ToNav { | 92 | pub(crate) trait ToNav { |
52 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget; | 93 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget; |
53 | } | 94 | } |
@@ -71,7 +112,7 @@ impl NavigationTarget { | |||
71 | name, | 112 | name, |
72 | None, | 113 | None, |
73 | frange.range, | 114 | frange.range, |
74 | src.value.syntax().kind(), | 115 | SymbolKind::Module, |
75 | ); | 116 | ); |
76 | res.docs = module.attrs(db).docs(); | 117 | res.docs = module.attrs(db).docs(); |
77 | res.description = src.value.short_label(); | 118 | res.description = src.value.short_label(); |
@@ -88,8 +129,13 @@ impl NavigationTarget { | |||
88 | 129 | ||
89 | #[cfg(test)] | 130 | #[cfg(test)] |
90 | pub(crate) fn debug_render(&self) -> String { | 131 | pub(crate) fn debug_render(&self) -> String { |
91 | let mut buf = | 132 | let mut buf = format!( |
92 | format!("{} {:?} {:?} {:?}", self.name, self.kind, self.file_id, self.full_range); | 133 | "{} {:?} {:?} {:?}", |
134 | self.name, | ||
135 | self.kind.unwrap(), | ||
136 | self.file_id, | ||
137 | self.full_range | ||
138 | ); | ||
93 | if let Some(focus_range) = self.focus_range { | 139 | if let Some(focus_range) = self.focus_range { |
94 | buf.push_str(&format!(" {:?}", focus_range)) | 140 | buf.push_str(&format!(" {:?}", focus_range)) |
95 | } | 141 | } |
@@ -103,6 +149,7 @@ impl NavigationTarget { | |||
103 | pub(crate) fn from_named( | 149 | pub(crate) fn from_named( |
104 | db: &RootDatabase, | 150 | db: &RootDatabase, |
105 | node: InFile<&dyn ast::NameOwner>, | 151 | node: InFile<&dyn ast::NameOwner>, |
152 | kind: SymbolKind, | ||
106 | ) -> NavigationTarget { | 153 | ) -> NavigationTarget { |
107 | let name = | 154 | let name = |
108 | node.value.name().map(|it| it.text().clone()).unwrap_or_else(|| SmolStr::new("_")); | 155 | node.value.name().map(|it| it.text().clone()).unwrap_or_else(|| SmolStr::new("_")); |
@@ -110,32 +157,7 @@ impl NavigationTarget { | |||
110 | node.value.name().map(|it| node.with_value(it.syntax()).original_file_range(db).range); | 157 | node.value.name().map(|it| node.with_value(it.syntax()).original_file_range(db).range); |
111 | let frange = node.map(|it| it.syntax()).original_file_range(db); | 158 | let frange = node.map(|it| it.syntax()).original_file_range(db); |
112 | 159 | ||
113 | NavigationTarget::from_syntax( | 160 | NavigationTarget::from_syntax(frange.file_id, name, focus_range, frange.range, kind) |
114 | frange.file_id, | ||
115 | name, | ||
116 | focus_range, | ||
117 | frange.range, | ||
118 | node.value.syntax().kind(), | ||
119 | ) | ||
120 | } | ||
121 | |||
122 | /// Allows `NavigationTarget` to be created from a `DocCommentsOwner` and a `NameOwner` | ||
123 | pub(crate) fn from_doc_commented( | ||
124 | db: &RootDatabase, | ||
125 | named: InFile<&dyn ast::NameOwner>, | ||
126 | node: InFile<&dyn ast::DocCommentsOwner>, | ||
127 | ) -> NavigationTarget { | ||
128 | let name = | ||
129 | named.value.name().map(|it| it.text().clone()).unwrap_or_else(|| SmolStr::new("_")); | ||
130 | let frange = node.map(|it| it.syntax()).original_file_range(db); | ||
131 | |||
132 | NavigationTarget::from_syntax( | ||
133 | frange.file_id, | ||
134 | name, | ||
135 | None, | ||
136 | frange.range, | ||
137 | node.value.syntax().kind(), | ||
138 | ) | ||
139 | } | 161 | } |
140 | 162 | ||
141 | fn from_syntax( | 163 | fn from_syntax( |
@@ -143,12 +165,12 @@ impl NavigationTarget { | |||
143 | name: SmolStr, | 165 | name: SmolStr, |
144 | focus_range: Option<TextRange>, | 166 | focus_range: Option<TextRange>, |
145 | full_range: TextRange, | 167 | full_range: TextRange, |
146 | kind: SyntaxKind, | 168 | kind: SymbolKind, |
147 | ) -> NavigationTarget { | 169 | ) -> NavigationTarget { |
148 | NavigationTarget { | 170 | NavigationTarget { |
149 | file_id, | 171 | file_id, |
150 | name, | 172 | name, |
151 | kind, | 173 | kind: Some(kind), |
152 | full_range, | 174 | full_range, |
153 | focus_range, | 175 | focus_range, |
154 | container_name: None, | 176 | container_name: None, |
@@ -163,12 +185,22 @@ impl ToNav for FileSymbol { | |||
163 | NavigationTarget { | 185 | NavigationTarget { |
164 | file_id: self.file_id, | 186 | file_id: self.file_id, |
165 | name: self.name.clone(), | 187 | name: self.name.clone(), |
166 | kind: self.kind, | 188 | kind: Some(match self.kind { |
189 | FileSymbolKind::Function => SymbolKind::Function, | ||
190 | FileSymbolKind::Struct => SymbolKind::Struct, | ||
191 | FileSymbolKind::Enum => SymbolKind::Enum, | ||
192 | FileSymbolKind::Trait => SymbolKind::Trait, | ||
193 | FileSymbolKind::Module => SymbolKind::Module, | ||
194 | FileSymbolKind::TypeAlias => SymbolKind::TypeAlias, | ||
195 | FileSymbolKind::Const => SymbolKind::Const, | ||
196 | FileSymbolKind::Static => SymbolKind::Static, | ||
197 | FileSymbolKind::Macro => SymbolKind::Macro, | ||
198 | }), | ||
167 | full_range: self.range, | 199 | full_range: self.range, |
168 | focus_range: self.name_range, | 200 | focus_range: self.name_range, |
169 | container_name: self.container_name.clone(), | 201 | container_name: self.container_name.clone(), |
170 | description: description_from_symbol(db, self), | 202 | description: description_from_symbol(db, self), |
171 | docs: docs_from_symbol(db, self), | 203 | docs: None, |
172 | } | 204 | } |
173 | } | 205 | } |
174 | } | 206 | } |
@@ -176,7 +208,15 @@ impl ToNav for FileSymbol { | |||
176 | impl TryToNav for Definition { | 208 | impl TryToNav for Definition { |
177 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { | 209 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { |
178 | match self { | 210 | match self { |
179 | Definition::Macro(it) => Some(it.to_nav(db)), | 211 | Definition::Macro(it) => { |
212 | // FIXME: Currently proc-macro do not have ast-node, | ||
213 | // such that it does not have source | ||
214 | // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913 | ||
215 | if it.is_proc_macro() { | ||
216 | return None; | ||
217 | } | ||
218 | Some(it.to_nav(db)) | ||
219 | } | ||
180 | Definition::Field(it) => Some(it.to_nav(db)), | 220 | Definition::Field(it) => Some(it.to_nav(db)), |
181 | Definition::ModuleDef(it) => it.try_to_nav(db), | 221 | Definition::ModuleDef(it) => it.try_to_nav(db), |
182 | Definition::SelfType(it) => Some(it.to_nav(db)), | 222 | Definition::SelfType(it) => Some(it.to_nav(db)), |
@@ -193,7 +233,7 @@ impl TryToNav for hir::ModuleDef { | |||
193 | hir::ModuleDef::Module(it) => it.to_nav(db), | 233 | hir::ModuleDef::Module(it) => it.to_nav(db), |
194 | hir::ModuleDef::Function(it) => it.to_nav(db), | 234 | hir::ModuleDef::Function(it) => it.to_nav(db), |
195 | hir::ModuleDef::Adt(it) => it.to_nav(db), | 235 | hir::ModuleDef::Adt(it) => it.to_nav(db), |
196 | hir::ModuleDef::EnumVariant(it) => it.to_nav(db), | 236 | hir::ModuleDef::Variant(it) => it.to_nav(db), |
197 | hir::ModuleDef::Const(it) => it.to_nav(db), | 237 | hir::ModuleDef::Const(it) => it.to_nav(db), |
198 | hir::ModuleDef::Static(it) => it.to_nav(db), | 238 | hir::ModuleDef::Static(it) => it.to_nav(db), |
199 | hir::ModuleDef::Trait(it) => it.to_nav(db), | 239 | hir::ModuleDef::Trait(it) => it.to_nav(db), |
@@ -204,16 +244,36 @@ impl TryToNav for hir::ModuleDef { | |||
204 | } | 244 | } |
205 | } | 245 | } |
206 | 246 | ||
207 | pub(crate) trait ToNavFromAst {} | 247 | pub(crate) trait ToNavFromAst { |
208 | impl ToNavFromAst for hir::Function {} | 248 | const KIND: SymbolKind; |
209 | impl ToNavFromAst for hir::Const {} | 249 | } |
210 | impl ToNavFromAst for hir::Static {} | 250 | impl ToNavFromAst for hir::Function { |
211 | impl ToNavFromAst for hir::Struct {} | 251 | const KIND: SymbolKind = SymbolKind::Function; |
212 | impl ToNavFromAst for hir::Enum {} | 252 | } |
213 | impl ToNavFromAst for hir::EnumVariant {} | 253 | impl ToNavFromAst for hir::Const { |
214 | impl ToNavFromAst for hir::Union {} | 254 | const KIND: SymbolKind = SymbolKind::Const; |
215 | impl ToNavFromAst for hir::TypeAlias {} | 255 | } |
216 | impl ToNavFromAst for hir::Trait {} | 256 | impl ToNavFromAst for hir::Static { |
257 | const KIND: SymbolKind = SymbolKind::Static; | ||
258 | } | ||
259 | impl ToNavFromAst for hir::Struct { | ||
260 | const KIND: SymbolKind = SymbolKind::Struct; | ||
261 | } | ||
262 | impl ToNavFromAst for hir::Enum { | ||
263 | const KIND: SymbolKind = SymbolKind::Enum; | ||
264 | } | ||
265 | impl ToNavFromAst for hir::Variant { | ||
266 | const KIND: SymbolKind = SymbolKind::Variant; | ||
267 | } | ||
268 | impl ToNavFromAst for hir::Union { | ||
269 | const KIND: SymbolKind = SymbolKind::Union; | ||
270 | } | ||
271 | impl ToNavFromAst for hir::TypeAlias { | ||
272 | const KIND: SymbolKind = SymbolKind::TypeAlias; | ||
273 | } | ||
274 | impl ToNavFromAst for hir::Trait { | ||
275 | const KIND: SymbolKind = SymbolKind::Trait; | ||
276 | } | ||
217 | 277 | ||
218 | impl<D> ToNav for D | 278 | impl<D> ToNav for D |
219 | where | 279 | where |
@@ -222,8 +282,11 @@ where | |||
222 | { | 282 | { |
223 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { | 283 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { |
224 | let src = self.source(db); | 284 | let src = self.source(db); |
225 | let mut res = | 285 | let mut res = NavigationTarget::from_named( |
226 | NavigationTarget::from_named(db, src.as_ref().map(|it| it as &dyn ast::NameOwner)); | 286 | db, |
287 | src.as_ref().map(|it| it as &dyn ast::NameOwner), | ||
288 | D::KIND, | ||
289 | ); | ||
227 | res.docs = self.docs(db); | 290 | res.docs = self.docs(db); |
228 | res.description = src.value.short_label(); | 291 | res.description = src.value.short_label(); |
229 | res | 292 | res |
@@ -241,7 +304,7 @@ impl ToNav for hir::Module { | |||
241 | } | 304 | } |
242 | }; | 305 | }; |
243 | let frange = src.with_value(syntax).original_file_range(db); | 306 | let frange = src.with_value(syntax).original_file_range(db); |
244 | NavigationTarget::from_syntax(frange.file_id, name, focus, frange.range, syntax.kind()) | 307 | NavigationTarget::from_syntax(frange.file_id, name, focus, frange.range, SymbolKind::Module) |
245 | } | 308 | } |
246 | } | 309 | } |
247 | 310 | ||
@@ -265,7 +328,7 @@ impl ToNav for hir::Impl { | |||
265 | "impl".into(), | 328 | "impl".into(), |
266 | focus_range, | 329 | focus_range, |
267 | frange.range, | 330 | frange.range, |
268 | src.value.syntax().kind(), | 331 | SymbolKind::Impl, |
269 | ) | 332 | ) |
270 | } | 333 | } |
271 | } | 334 | } |
@@ -276,7 +339,8 @@ impl ToNav for hir::Field { | |||
276 | 339 | ||
277 | match &src.value { | 340 | match &src.value { |
278 | FieldSource::Named(it) => { | 341 | FieldSource::Named(it) => { |
279 | let mut res = NavigationTarget::from_named(db, src.with_value(it)); | 342 | let mut res = |
343 | NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field); | ||
280 | res.docs = self.docs(db); | 344 | res.docs = self.docs(db); |
281 | res.description = it.short_label(); | 345 | res.description = it.short_label(); |
282 | res | 346 | res |
@@ -288,7 +352,7 @@ impl ToNav for hir::Field { | |||
288 | "".into(), | 352 | "".into(), |
289 | None, | 353 | None, |
290 | frange.range, | 354 | frange.range, |
291 | it.syntax().kind(), | 355 | SymbolKind::Field, |
292 | ) | 356 | ) |
293 | } | 357 | } |
294 | } | 358 | } |
@@ -299,8 +363,11 @@ impl ToNav for hir::MacroDef { | |||
299 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { | 363 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { |
300 | let src = self.source(db); | 364 | let src = self.source(db); |
301 | log::debug!("nav target {:#?}", src.value.syntax()); | 365 | log::debug!("nav target {:#?}", src.value.syntax()); |
302 | let mut res = | 366 | let mut res = NavigationTarget::from_named( |
303 | NavigationTarget::from_named(db, src.as_ref().map(|it| it as &dyn ast::NameOwner)); | 367 | db, |
368 | src.as_ref().map(|it| it as &dyn ast::NameOwner), | ||
369 | SymbolKind::Macro, | ||
370 | ); | ||
304 | res.docs = self.docs(db); | 371 | res.docs = self.docs(db); |
305 | res | 372 | res |
306 | } | 373 | } |
@@ -340,10 +407,11 @@ impl ToNav for hir::Local { | |||
340 | Some(it) => it.to_string().into(), | 407 | Some(it) => it.to_string().into(), |
341 | None => "".into(), | 408 | None => "".into(), |
342 | }; | 409 | }; |
410 | let kind = if self.is_param(db) { SymbolKind::ValueParam } else { SymbolKind::Local }; | ||
343 | NavigationTarget { | 411 | NavigationTarget { |
344 | file_id: full_range.file_id, | 412 | file_id: full_range.file_id, |
345 | name, | 413 | name, |
346 | kind: IDENT_PAT, | 414 | kind: Some(kind), |
347 | full_range: full_range.range, | 415 | full_range: full_range.range, |
348 | focus_range: None, | 416 | focus_range: None, |
349 | container_name: None, | 417 | container_name: None, |
@@ -367,7 +435,7 @@ impl ToNav for hir::TypeParam { | |||
367 | NavigationTarget { | 435 | NavigationTarget { |
368 | file_id: src.file_id.original_file(db), | 436 | file_id: src.file_id.original_file(db), |
369 | name: self.name(db).to_string().into(), | 437 | name: self.name(db).to_string().into(), |
370 | kind: TYPE_PARAM, | 438 | kind: Some(SymbolKind::TypeParam), |
371 | full_range, | 439 | full_range, |
372 | focus_range, | 440 | focus_range, |
373 | container_name: None, | 441 | container_name: None, |
@@ -384,7 +452,7 @@ impl ToNav for hir::LifetimeParam { | |||
384 | NavigationTarget { | 452 | NavigationTarget { |
385 | file_id: src.file_id.original_file(db), | 453 | file_id: src.file_id.original_file(db), |
386 | name: self.name(db).to_string().into(), | 454 | name: self.name(db).to_string().into(), |
387 | kind: LIFETIME_PARAM, | 455 | kind: Some(SymbolKind::LifetimeParam), |
388 | full_range, | 456 | full_range, |
389 | focus_range: Some(full_range), | 457 | focus_range: Some(full_range), |
390 | container_name: None, | 458 | container_name: None, |
@@ -394,30 +462,6 @@ impl ToNav for hir::LifetimeParam { | |||
394 | } | 462 | } |
395 | } | 463 | } |
396 | 464 | ||
397 | pub(crate) fn docs_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option<Documentation> { | ||
398 | let parse = db.parse(symbol.file_id); | ||
399 | let node = symbol.ptr.to_node(parse.tree().syntax()); | ||
400 | let file_id = HirFileId::from(symbol.file_id); | ||
401 | |||
402 | let it = match_ast! { | ||
403 | match node { | ||
404 | ast::Fn(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
405 | ast::Struct(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
406 | ast::Enum(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
407 | ast::Trait(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
408 | ast::Module(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
409 | ast::TypeAlias(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
410 | ast::Const(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
411 | ast::Static(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
412 | ast::RecordField(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
413 | ast::Variant(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
414 | ast::MacroCall(it) => hir::Attrs::from_attrs_owner(db, InFile::new(file_id, &it)), | ||
415 | _ => return None, | ||
416 | } | ||
417 | }; | ||
418 | it.docs() | ||
419 | } | ||
420 | |||
421 | /// Get a description of a symbol. | 465 | /// Get a description of a symbol. |
422 | /// | 466 | /// |
423 | /// e.g. `struct Name`, `enum Name`, `fn Name` | 467 | /// e.g. `struct Name`, `enum Name`, `fn Name` |
@@ -465,34 +509,21 @@ fn foo() { enum FooInner { } } | |||
465 | 0, | 509 | 0, |
466 | ), | 510 | ), |
467 | full_range: 0..17, | 511 | full_range: 0..17, |
468 | focus_range: Some( | 512 | focus_range: 5..13, |
469 | 5..13, | ||
470 | ), | ||
471 | name: "FooInner", | 513 | name: "FooInner", |
472 | kind: ENUM, | 514 | kind: Enum, |
473 | container_name: None, | 515 | description: "enum FooInner", |
474 | description: Some( | ||
475 | "enum FooInner", | ||
476 | ), | ||
477 | docs: None, | ||
478 | }, | 516 | }, |
479 | NavigationTarget { | 517 | NavigationTarget { |
480 | file_id: FileId( | 518 | file_id: FileId( |
481 | 0, | 519 | 0, |
482 | ), | 520 | ), |
483 | full_range: 29..46, | 521 | full_range: 29..46, |
484 | focus_range: Some( | 522 | focus_range: 34..42, |
485 | 34..42, | ||
486 | ), | ||
487 | name: "FooInner", | 523 | name: "FooInner", |
488 | kind: ENUM, | 524 | kind: Enum, |
489 | container_name: Some( | 525 | container_name: "foo", |
490 | "foo", | 526 | description: "enum FooInner", |
491 | ), | ||
492 | description: Some( | ||
493 | "enum FooInner", | ||
494 | ), | ||
495 | docs: None, | ||
496 | }, | 527 | }, |
497 | ] | 528 | ] |
498 | "#]] | 529 | "#]] |
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs index 79c081cac..b61ea0b3e 100644 --- a/crates/ide/src/doc_links.rs +++ b/crates/ide/src/doc_links.rs | |||
@@ -181,7 +181,7 @@ fn rewrite_intra_doc_link( | |||
181 | ModuleDef::Module(it) => it.resolve_doc_path(db, link, ns), | 181 | ModuleDef::Module(it) => it.resolve_doc_path(db, link, ns), |
182 | ModuleDef::Function(it) => it.resolve_doc_path(db, link, ns), | 182 | ModuleDef::Function(it) => it.resolve_doc_path(db, link, ns), |
183 | ModuleDef::Adt(it) => it.resolve_doc_path(db, link, ns), | 183 | ModuleDef::Adt(it) => it.resolve_doc_path(db, link, ns), |
184 | ModuleDef::EnumVariant(it) => it.resolve_doc_path(db, link, ns), | 184 | ModuleDef::Variant(it) => it.resolve_doc_path(db, link, ns), |
185 | ModuleDef::Const(it) => it.resolve_doc_path(db, link, ns), | 185 | ModuleDef::Const(it) => it.resolve_doc_path(db, link, ns), |
186 | ModuleDef::Static(it) => it.resolve_doc_path(db, link, ns), | 186 | ModuleDef::Static(it) => it.resolve_doc_path(db, link, ns), |
187 | ModuleDef::Trait(it) => it.resolve_doc_path(db, link, ns), | 187 | ModuleDef::Trait(it) => it.resolve_doc_path(db, link, ns), |
@@ -390,7 +390,7 @@ fn get_symbol_filename(db: &dyn HirDatabase, definition: &ModuleDef) -> Option<S | |||
390 | ModuleDef::TypeAlias(t) => format!("type.{}.html", t.name(db)), | 390 | ModuleDef::TypeAlias(t) => format!("type.{}.html", t.name(db)), |
391 | ModuleDef::BuiltinType(t) => format!("primitive.{}.html", t.as_name()), | 391 | ModuleDef::BuiltinType(t) => format!("primitive.{}.html", t.as_name()), |
392 | ModuleDef::Function(f) => format!("fn.{}.html", f.name(db)), | 392 | ModuleDef::Function(f) => format!("fn.{}.html", f.name(db)), |
393 | ModuleDef::EnumVariant(ev) => { | 393 | ModuleDef::Variant(ev) => { |
394 | format!("enum.{}.html#variant.{}", ev.parent_enum(db).name(db), ev.name(db)) | 394 | format!("enum.{}.html#variant.{}", ev.parent_enum(db).name(db), ev.name(db)) |
395 | } | 395 | } |
396 | ModuleDef::Const(c) => format!("const.{}.html", c.name(db)?), | 396 | ModuleDef::Const(c) => format!("const.{}.html", c.name(db)?), |
diff --git a/crates/ide/src/file_structure.rs b/crates/ide/src/file_structure.rs index c51531391..32556dad3 100644 --- a/crates/ide/src/file_structure.rs +++ b/crates/ide/src/file_structure.rs | |||
@@ -1,15 +1,17 @@ | |||
1 | use syntax::{ | 1 | use syntax::{ |
2 | ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, | 2 | ast::{self, AttrsOwner, GenericParamsOwner, NameOwner}, |
3 | match_ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, WalkEvent, | 3 | match_ast, AstNode, SourceFile, SyntaxNode, TextRange, WalkEvent, |
4 | }; | 4 | }; |
5 | 5 | ||
6 | use crate::SymbolKind; | ||
7 | |||
6 | #[derive(Debug, Clone)] | 8 | #[derive(Debug, Clone)] |
7 | pub struct StructureNode { | 9 | pub struct StructureNode { |
8 | pub parent: Option<usize>, | 10 | pub parent: Option<usize>, |
9 | pub label: String, | 11 | pub label: String, |
10 | pub navigation_range: TextRange, | 12 | pub navigation_range: TextRange, |
11 | pub node_range: TextRange, | 13 | pub node_range: TextRange, |
12 | pub kind: SyntaxKind, | 14 | pub kind: SymbolKind, |
13 | pub detail: Option<String>, | 15 | pub detail: Option<String>, |
14 | pub deprecated: bool, | 16 | pub deprecated: bool, |
15 | } | 17 | } |
@@ -51,25 +53,27 @@ pub(crate) fn file_structure(file: &SourceFile) -> Vec<StructureNode> { | |||
51 | } | 53 | } |
52 | 54 | ||
53 | fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | 55 | fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { |
54 | fn decl<N: NameOwner + AttrsOwner>(node: N) -> Option<StructureNode> { | 56 | fn decl<N: NameOwner + AttrsOwner>(node: N, kind: SymbolKind) -> Option<StructureNode> { |
55 | decl_with_detail(&node, None) | 57 | decl_with_detail(&node, None, kind) |
56 | } | 58 | } |
57 | 59 | ||
58 | fn decl_with_type_ref<N: NameOwner + AttrsOwner>( | 60 | fn decl_with_type_ref<N: NameOwner + AttrsOwner>( |
59 | node: &N, | 61 | node: &N, |
60 | type_ref: Option<ast::Type>, | 62 | type_ref: Option<ast::Type>, |
63 | kind: SymbolKind, | ||
61 | ) -> Option<StructureNode> { | 64 | ) -> Option<StructureNode> { |
62 | let detail = type_ref.map(|type_ref| { | 65 | let detail = type_ref.map(|type_ref| { |
63 | let mut detail = String::new(); | 66 | let mut detail = String::new(); |
64 | collapse_ws(type_ref.syntax(), &mut detail); | 67 | collapse_ws(type_ref.syntax(), &mut detail); |
65 | detail | 68 | detail |
66 | }); | 69 | }); |
67 | decl_with_detail(node, detail) | 70 | decl_with_detail(node, detail, kind) |
68 | } | 71 | } |
69 | 72 | ||
70 | fn decl_with_detail<N: NameOwner + AttrsOwner>( | 73 | fn decl_with_detail<N: NameOwner + AttrsOwner>( |
71 | node: &N, | 74 | node: &N, |
72 | detail: Option<String>, | 75 | detail: Option<String>, |
76 | kind: SymbolKind, | ||
73 | ) -> Option<StructureNode> { | 77 | ) -> Option<StructureNode> { |
74 | let name = node.name()?; | 78 | let name = node.name()?; |
75 | 79 | ||
@@ -78,7 +82,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | |||
78 | label: name.text().to_string(), | 82 | label: name.text().to_string(), |
79 | navigation_range: name.syntax().text_range(), | 83 | navigation_range: name.syntax().text_range(), |
80 | node_range: node.syntax().text_range(), | 84 | node_range: node.syntax().text_range(), |
81 | kind: node.syntax().kind(), | 85 | kind, |
82 | detail, | 86 | detail, |
83 | deprecated: node.attrs().filter_map(|x| x.simple_name()).any(|x| x == "deprecated"), | 87 | deprecated: node.attrs().filter_map(|x| x.simple_name()).any(|x| x == "deprecated"), |
84 | }) | 88 | }) |
@@ -117,18 +121,18 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | |||
117 | collapse_ws(ret_type.syntax(), &mut detail); | 121 | collapse_ws(ret_type.syntax(), &mut detail); |
118 | } | 122 | } |
119 | 123 | ||
120 | decl_with_detail(&it, Some(detail)) | 124 | decl_with_detail(&it, Some(detail), SymbolKind::Function) |
121 | }, | 125 | }, |
122 | ast::Struct(it) => decl(it), | 126 | ast::Struct(it) => decl(it, SymbolKind::Struct), |
123 | ast::Union(it) => decl(it), | 127 | ast::Union(it) => decl(it, SymbolKind::Union), |
124 | ast::Enum(it) => decl(it), | 128 | ast::Enum(it) => decl(it, SymbolKind::Enum), |
125 | ast::Variant(it) => decl(it), | 129 | ast::Variant(it) => decl(it, SymbolKind::Variant), |
126 | ast::Trait(it) => decl(it), | 130 | ast::Trait(it) => decl(it, SymbolKind::Trait), |
127 | ast::Module(it) => decl(it), | 131 | ast::Module(it) => decl(it, SymbolKind::Module), |
128 | ast::TypeAlias(it) => decl_with_type_ref(&it, it.ty()), | 132 | ast::TypeAlias(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::TypeAlias), |
129 | ast::RecordField(it) => decl_with_type_ref(&it, it.ty()), | 133 | ast::RecordField(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Field), |
130 | ast::Const(it) => decl_with_type_ref(&it, it.ty()), | 134 | ast::Const(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Const), |
131 | ast::Static(it) => decl_with_type_ref(&it, it.ty()), | 135 | ast::Static(it) => decl_with_type_ref(&it, it.ty(), SymbolKind::Static), |
132 | ast::Impl(it) => { | 136 | ast::Impl(it) => { |
133 | let target_type = it.self_ty()?; | 137 | let target_type = it.self_ty()?; |
134 | let target_trait = it.trait_(); | 138 | let target_trait = it.trait_(); |
@@ -144,13 +148,13 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | |||
144 | label, | 148 | label, |
145 | navigation_range: target_type.syntax().text_range(), | 149 | navigation_range: target_type.syntax().text_range(), |
146 | node_range: it.syntax().text_range(), | 150 | node_range: it.syntax().text_range(), |
147 | kind: it.syntax().kind(), | 151 | kind: SymbolKind::Impl, |
148 | detail: None, | 152 | detail: None, |
149 | deprecated: false, | 153 | deprecated: false, |
150 | }; | 154 | }; |
151 | Some(node) | 155 | Some(node) |
152 | }, | 156 | }, |
153 | ast::MacroRules(it) => decl(it), | 157 | ast::MacroRules(it) => decl(it, SymbolKind::Macro), |
154 | _ => None, | 158 | _ => None, |
155 | } | 159 | } |
156 | } | 160 | } |
@@ -222,7 +226,7 @@ fn very_obsolete() {} | |||
222 | label: "Foo", | 226 | label: "Foo", |
223 | navigation_range: 8..11, | 227 | navigation_range: 8..11, |
224 | node_range: 1..26, | 228 | node_range: 1..26, |
225 | kind: STRUCT, | 229 | kind: Struct, |
226 | detail: None, | 230 | detail: None, |
227 | deprecated: false, | 231 | deprecated: false, |
228 | }, | 232 | }, |
@@ -233,7 +237,7 @@ fn very_obsolete() {} | |||
233 | label: "x", | 237 | label: "x", |
234 | navigation_range: 18..19, | 238 | navigation_range: 18..19, |
235 | node_range: 18..24, | 239 | node_range: 18..24, |
236 | kind: RECORD_FIELD, | 240 | kind: Field, |
237 | detail: Some( | 241 | detail: Some( |
238 | "i32", | 242 | "i32", |
239 | ), | 243 | ), |
@@ -244,7 +248,7 @@ fn very_obsolete() {} | |||
244 | label: "m", | 248 | label: "m", |
245 | navigation_range: 32..33, | 249 | navigation_range: 32..33, |
246 | node_range: 28..158, | 250 | node_range: 28..158, |
247 | kind: MODULE, | 251 | kind: Module, |
248 | detail: None, | 252 | detail: None, |
249 | deprecated: false, | 253 | deprecated: false, |
250 | }, | 254 | }, |
@@ -255,7 +259,7 @@ fn very_obsolete() {} | |||
255 | label: "bar1", | 259 | label: "bar1", |
256 | navigation_range: 43..47, | 260 | navigation_range: 43..47, |
257 | node_range: 40..52, | 261 | node_range: 40..52, |
258 | kind: FN, | 262 | kind: Function, |
259 | detail: Some( | 263 | detail: Some( |
260 | "fn()", | 264 | "fn()", |
261 | ), | 265 | ), |
@@ -268,7 +272,7 @@ fn very_obsolete() {} | |||
268 | label: "bar2", | 272 | label: "bar2", |
269 | navigation_range: 60..64, | 273 | navigation_range: 60..64, |
270 | node_range: 57..81, | 274 | node_range: 57..81, |
271 | kind: FN, | 275 | kind: Function, |
272 | detail: Some( | 276 | detail: Some( |
273 | "fn<T>(t: T) -> T", | 277 | "fn<T>(t: T) -> T", |
274 | ), | 278 | ), |
@@ -281,7 +285,7 @@ fn very_obsolete() {} | |||
281 | label: "bar3", | 285 | label: "bar3", |
282 | navigation_range: 89..93, | 286 | navigation_range: 89..93, |
283 | node_range: 86..156, | 287 | node_range: 86..156, |
284 | kind: FN, | 288 | kind: Function, |
285 | detail: Some( | 289 | detail: Some( |
286 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", | 290 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", |
287 | ), | 291 | ), |
@@ -292,7 +296,7 @@ fn very_obsolete() {} | |||
292 | label: "E", | 296 | label: "E", |
293 | navigation_range: 165..166, | 297 | navigation_range: 165..166, |
294 | node_range: 160..180, | 298 | node_range: 160..180, |
295 | kind: ENUM, | 299 | kind: Enum, |
296 | detail: None, | 300 | detail: None, |
297 | deprecated: false, | 301 | deprecated: false, |
298 | }, | 302 | }, |
@@ -303,7 +307,7 @@ fn very_obsolete() {} | |||
303 | label: "X", | 307 | label: "X", |
304 | navigation_range: 169..170, | 308 | navigation_range: 169..170, |
305 | node_range: 169..170, | 309 | node_range: 169..170, |
306 | kind: VARIANT, | 310 | kind: Variant, |
307 | detail: None, | 311 | detail: None, |
308 | deprecated: false, | 312 | deprecated: false, |
309 | }, | 313 | }, |
@@ -314,7 +318,7 @@ fn very_obsolete() {} | |||
314 | label: "Y", | 318 | label: "Y", |
315 | navigation_range: 172..173, | 319 | navigation_range: 172..173, |
316 | node_range: 172..178, | 320 | node_range: 172..178, |
317 | kind: VARIANT, | 321 | kind: Variant, |
318 | detail: None, | 322 | detail: None, |
319 | deprecated: false, | 323 | deprecated: false, |
320 | }, | 324 | }, |
@@ -323,7 +327,7 @@ fn very_obsolete() {} | |||
323 | label: "T", | 327 | label: "T", |
324 | navigation_range: 186..187, | 328 | navigation_range: 186..187, |
325 | node_range: 181..193, | 329 | node_range: 181..193, |
326 | kind: TYPE_ALIAS, | 330 | kind: TypeAlias, |
327 | detail: Some( | 331 | detail: Some( |
328 | "()", | 332 | "()", |
329 | ), | 333 | ), |
@@ -334,7 +338,7 @@ fn very_obsolete() {} | |||
334 | label: "S", | 338 | label: "S", |
335 | navigation_range: 201..202, | 339 | navigation_range: 201..202, |
336 | node_range: 194..213, | 340 | node_range: 194..213, |
337 | kind: STATIC, | 341 | kind: Static, |
338 | detail: Some( | 342 | detail: Some( |
339 | "i32", | 343 | "i32", |
340 | ), | 344 | ), |
@@ -345,7 +349,7 @@ fn very_obsolete() {} | |||
345 | label: "C", | 349 | label: "C", |
346 | navigation_range: 220..221, | 350 | navigation_range: 220..221, |
347 | node_range: 214..232, | 351 | node_range: 214..232, |
348 | kind: CONST, | 352 | kind: Const, |
349 | detail: Some( | 353 | detail: Some( |
350 | "i32", | 354 | "i32", |
351 | ), | 355 | ), |
@@ -356,7 +360,7 @@ fn very_obsolete() {} | |||
356 | label: "impl E", | 360 | label: "impl E", |
357 | navigation_range: 239..240, | 361 | navigation_range: 239..240, |
358 | node_range: 234..243, | 362 | node_range: 234..243, |
359 | kind: IMPL, | 363 | kind: Impl, |
360 | detail: None, | 364 | detail: None, |
361 | deprecated: false, | 365 | deprecated: false, |
362 | }, | 366 | }, |
@@ -365,7 +369,7 @@ fn very_obsolete() {} | |||
365 | label: "impl fmt::Debug for E", | 369 | label: "impl fmt::Debug for E", |
366 | navigation_range: 265..266, | 370 | navigation_range: 265..266, |
367 | node_range: 245..269, | 371 | node_range: 245..269, |
368 | kind: IMPL, | 372 | kind: Impl, |
369 | detail: None, | 373 | detail: None, |
370 | deprecated: false, | 374 | deprecated: false, |
371 | }, | 375 | }, |
@@ -374,7 +378,7 @@ fn very_obsolete() {} | |||
374 | label: "mc", | 378 | label: "mc", |
375 | navigation_range: 284..286, | 379 | navigation_range: 284..286, |
376 | node_range: 271..303, | 380 | node_range: 271..303, |
377 | kind: MACRO_RULES, | 381 | kind: Macro, |
378 | detail: None, | 382 | detail: None, |
379 | deprecated: false, | 383 | deprecated: false, |
380 | }, | 384 | }, |
@@ -383,7 +387,7 @@ fn very_obsolete() {} | |||
383 | label: "mcexp", | 387 | label: "mcexp", |
384 | navigation_range: 334..339, | 388 | navigation_range: 334..339, |
385 | node_range: 305..356, | 389 | node_range: 305..356, |
386 | kind: MACRO_RULES, | 390 | kind: Macro, |
387 | detail: None, | 391 | detail: None, |
388 | deprecated: false, | 392 | deprecated: false, |
389 | }, | 393 | }, |
@@ -392,7 +396,7 @@ fn very_obsolete() {} | |||
392 | label: "mcexp", | 396 | label: "mcexp", |
393 | navigation_range: 387..392, | 397 | navigation_range: 387..392, |
394 | node_range: 358..409, | 398 | node_range: 358..409, |
395 | kind: MACRO_RULES, | 399 | kind: Macro, |
396 | detail: None, | 400 | detail: None, |
397 | deprecated: false, | 401 | deprecated: false, |
398 | }, | 402 | }, |
@@ -401,7 +405,7 @@ fn very_obsolete() {} | |||
401 | label: "obsolete", | 405 | label: "obsolete", |
402 | navigation_range: 428..436, | 406 | navigation_range: 428..436, |
403 | node_range: 411..441, | 407 | node_range: 411..441, |
404 | kind: FN, | 408 | kind: Function, |
405 | detail: Some( | 409 | detail: Some( |
406 | "fn()", | 410 | "fn()", |
407 | ), | 411 | ), |
@@ -412,7 +416,7 @@ fn very_obsolete() {} | |||
412 | label: "very_obsolete", | 416 | label: "very_obsolete", |
413 | navigation_range: 481..494, | 417 | navigation_range: 481..494, |
414 | node_range: 443..499, | 418 | node_range: 443..499, |
415 | kind: FN, | 419 | kind: Function, |
416 | detail: Some( | 420 | detail: Some( |
417 | "fn()", | 421 | "fn()", |
418 | ), | 422 | ), |
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index d75ae447b..431da5d9c 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs | |||
@@ -9,7 +9,7 @@ use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, | |||
9 | 9 | ||
10 | use crate::{ | 10 | use crate::{ |
11 | display::{ToNav, TryToNav}, | 11 | display::{ToNav, TryToNav}, |
12 | FilePosition, NavigationTarget, RangeInfo, | 12 | FilePosition, NavigationTarget, RangeInfo, SymbolKind, |
13 | }; | 13 | }; |
14 | 14 | ||
15 | // Feature: Go to Definition | 15 | // Feature: Go to Definition |
@@ -86,7 +86,7 @@ fn self_to_nav_target(self_param: ast::SelfParam, file_id: FileId) -> Option<Nav | |||
86 | full_range: self_param.syntax().text_range(), | 86 | full_range: self_param.syntax().text_range(), |
87 | focus_range: Some(self_token.text_range()), | 87 | focus_range: Some(self_token.text_range()), |
88 | name: self_token.text().clone(), | 88 | name: self_token.text().clone(), |
89 | kind: self_token.kind(), | 89 | kind: Some(SymbolKind::SelfParam), |
90 | container_name: None, | 90 | container_name: None, |
91 | description: None, | 91 | description: None, |
92 | docs: None, | 92 | docs: None, |
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs index e82aad6d5..52f993cc9 100644 --- a/crates/ide/src/hover.rs +++ b/crates/ide/src/hover.rs | |||
@@ -297,7 +297,7 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String> | |||
297 | AssocItemContainer::Trait(t) => Some(t.name(db)), | 297 | AssocItemContainer::Trait(t) => Some(t.name(db)), |
298 | AssocItemContainer::Impl(i) => i.target_ty(db).as_adt().map(|adt| adt.name(db)), | 298 | AssocItemContainer::Impl(i) => i.target_ty(db).as_adt().map(|adt| adt.name(db)), |
299 | }, | 299 | }, |
300 | ModuleDef::EnumVariant(e) => Some(e.parent_enum(db).name(db)), | 300 | ModuleDef::Variant(e) => Some(e.parent_enum(db).name(db)), |
301 | _ => None, | 301 | _ => None, |
302 | }, | 302 | }, |
303 | _ => None, | 303 | _ => None, |
@@ -324,6 +324,12 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> { | |||
324 | let mod_path = definition_mod_path(db, &def); | 324 | let mod_path = definition_mod_path(db, &def); |
325 | return match def { | 325 | return match def { |
326 | Definition::Macro(it) => { | 326 | Definition::Macro(it) => { |
327 | // FIXME: Currently proc-macro do not have ast-node, | ||
328 | // such that it does not have source | ||
329 | // more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913 | ||
330 | if it.is_proc_macro() { | ||
331 | return None; | ||
332 | } | ||
327 | let label = macro_label(&it.source(db).value); | 333 | let label = macro_label(&it.source(db).value); |
328 | from_def_source_labeled(db, it, Some(label), mod_path) | 334 | from_def_source_labeled(db, it, Some(label), mod_path) |
329 | } | 335 | } |
@@ -349,7 +355,7 @@ fn hover_for_definition(db: &RootDatabase, def: Definition) -> Option<Markup> { | |||
349 | ModuleDef::Adt(Adt::Struct(it)) => from_def_source(db, it, mod_path), | 355 | ModuleDef::Adt(Adt::Struct(it)) => from_def_source(db, it, mod_path), |
350 | ModuleDef::Adt(Adt::Union(it)) => from_def_source(db, it, mod_path), | 356 | ModuleDef::Adt(Adt::Union(it)) => from_def_source(db, it, mod_path), |
351 | ModuleDef::Adt(Adt::Enum(it)) => from_def_source(db, it, mod_path), | 357 | ModuleDef::Adt(Adt::Enum(it)) => from_def_source(db, it, mod_path), |
352 | ModuleDef::EnumVariant(it) => from_def_source(db, it, mod_path), | 358 | ModuleDef::Variant(it) => from_def_source(db, it, mod_path), |
353 | ModuleDef::Const(it) => from_def_source(db, it, mod_path), | 359 | ModuleDef::Const(it) => from_def_source(db, it, mod_path), |
354 | ModuleDef::Static(it) => from_def_source(db, it, mod_path), | 360 | ModuleDef::Static(it) => from_def_source(db, it, mod_path), |
355 | ModuleDef::Trait(it) => from_def_source(db, it, mod_path), | 361 | ModuleDef::Trait(it) => from_def_source(db, it, mod_path), |
@@ -2181,14 +2187,9 @@ fn foo_<|>test() {} | |||
2181 | 0, | 2187 | 0, |
2182 | ), | 2188 | ), |
2183 | full_range: 0..24, | 2189 | full_range: 0..24, |
2184 | focus_range: Some( | 2190 | focus_range: 11..19, |
2185 | 11..19, | ||
2186 | ), | ||
2187 | name: "foo_test", | 2191 | name: "foo_test", |
2188 | kind: FN, | 2192 | kind: Function, |
2189 | container_name: None, | ||
2190 | description: None, | ||
2191 | docs: None, | ||
2192 | }, | 2193 | }, |
2193 | kind: Test { | 2194 | kind: Test { |
2194 | test_id: Path( | 2195 | test_id: Path( |
@@ -2224,14 +2225,9 @@ mod tests<|> { | |||
2224 | 0, | 2225 | 0, |
2225 | ), | 2226 | ), |
2226 | full_range: 0..46, | 2227 | full_range: 0..46, |
2227 | focus_range: Some( | 2228 | focus_range: 4..9, |
2228 | 4..9, | ||
2229 | ), | ||
2230 | name: "tests", | 2229 | name: "tests", |
2231 | kind: MODULE, | 2230 | kind: Module, |
2232 | container_name: None, | ||
2233 | description: None, | ||
2234 | docs: None, | ||
2235 | }, | 2231 | }, |
2236 | kind: TestMod { | 2232 | kind: TestMod { |
2237 | path: "tests", | 2233 | path: "tests", |
@@ -2263,16 +2259,10 @@ fn main() { let s<|>t = S{ f1:0 }; } | |||
2263 | 0, | 2259 | 0, |
2264 | ), | 2260 | ), |
2265 | full_range: 0..19, | 2261 | full_range: 0..19, |
2266 | focus_range: Some( | 2262 | focus_range: 7..8, |
2267 | 7..8, | ||
2268 | ), | ||
2269 | name: "S", | 2263 | name: "S", |
2270 | kind: STRUCT, | 2264 | kind: Struct, |
2271 | container_name: None, | 2265 | description: "struct S", |
2272 | description: Some( | ||
2273 | "struct S", | ||
2274 | ), | ||
2275 | docs: None, | ||
2276 | }, | 2266 | }, |
2277 | }, | 2267 | }, |
2278 | ], | 2268 | ], |
@@ -2302,16 +2292,10 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; } | |||
2302 | 0, | 2292 | 0, |
2303 | ), | 2293 | ), |
2304 | full_range: 17..37, | 2294 | full_range: 17..37, |
2305 | focus_range: Some( | 2295 | focus_range: 24..25, |
2306 | 24..25, | ||
2307 | ), | ||
2308 | name: "S", | 2296 | name: "S", |
2309 | kind: STRUCT, | 2297 | kind: Struct, |
2310 | container_name: None, | 2298 | description: "struct S", |
2311 | description: Some( | ||
2312 | "struct S", | ||
2313 | ), | ||
2314 | docs: None, | ||
2315 | }, | 2299 | }, |
2316 | }, | 2300 | }, |
2317 | HoverGotoTypeData { | 2301 | HoverGotoTypeData { |
@@ -2321,16 +2305,10 @@ fn main() { let s<|>t = S{ f1:Arg(0) }; } | |||
2321 | 0, | 2305 | 0, |
2322 | ), | 2306 | ), |
2323 | full_range: 0..16, | 2307 | full_range: 0..16, |
2324 | focus_range: Some( | 2308 | focus_range: 7..10, |
2325 | 7..10, | ||
2326 | ), | ||
2327 | name: "Arg", | 2309 | name: "Arg", |
2328 | kind: STRUCT, | 2310 | kind: Struct, |
2329 | container_name: None, | 2311 | description: "struct Arg", |
2330 | description: Some( | ||
2331 | "struct Arg", | ||
2332 | ), | ||
2333 | docs: None, | ||
2334 | }, | 2312 | }, |
2335 | }, | 2313 | }, |
2336 | ], | 2314 | ], |
@@ -2360,16 +2338,10 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; } | |||
2360 | 0, | 2338 | 0, |
2361 | ), | 2339 | ), |
2362 | full_range: 17..37, | 2340 | full_range: 17..37, |
2363 | focus_range: Some( | 2341 | focus_range: 24..25, |
2364 | 24..25, | ||
2365 | ), | ||
2366 | name: "S", | 2342 | name: "S", |
2367 | kind: STRUCT, | 2343 | kind: Struct, |
2368 | container_name: None, | 2344 | description: "struct S", |
2369 | description: Some( | ||
2370 | "struct S", | ||
2371 | ), | ||
2372 | docs: None, | ||
2373 | }, | 2345 | }, |
2374 | }, | 2346 | }, |
2375 | HoverGotoTypeData { | 2347 | HoverGotoTypeData { |
@@ -2379,16 +2351,10 @@ fn main() { let s<|>t = S{ f1: S{ f1: Arg(0) } }; } | |||
2379 | 0, | 2351 | 0, |
2380 | ), | 2352 | ), |
2381 | full_range: 0..16, | 2353 | full_range: 0..16, |
2382 | focus_range: Some( | 2354 | focus_range: 7..10, |
2383 | 7..10, | ||
2384 | ), | ||
2385 | name: "Arg", | 2355 | name: "Arg", |
2386 | kind: STRUCT, | 2356 | kind: Struct, |
2387 | container_name: None, | 2357 | description: "struct Arg", |
2388 | description: Some( | ||
2389 | "struct Arg", | ||
2390 | ), | ||
2391 | docs: None, | ||
2392 | }, | 2358 | }, |
2393 | }, | 2359 | }, |
2394 | ], | 2360 | ], |
@@ -2421,16 +2387,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); } | |||
2421 | 0, | 2387 | 0, |
2422 | ), | 2388 | ), |
2423 | full_range: 0..14, | 2389 | full_range: 0..14, |
2424 | focus_range: Some( | 2390 | focus_range: 7..8, |
2425 | 7..8, | ||
2426 | ), | ||
2427 | name: "A", | 2391 | name: "A", |
2428 | kind: STRUCT, | 2392 | kind: Struct, |
2429 | container_name: None, | 2393 | description: "struct A", |
2430 | description: Some( | ||
2431 | "struct A", | ||
2432 | ), | ||
2433 | docs: None, | ||
2434 | }, | 2394 | }, |
2435 | }, | 2395 | }, |
2436 | HoverGotoTypeData { | 2396 | HoverGotoTypeData { |
@@ -2440,16 +2400,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); } | |||
2440 | 0, | 2400 | 0, |
2441 | ), | 2401 | ), |
2442 | full_range: 15..29, | 2402 | full_range: 15..29, |
2443 | focus_range: Some( | 2403 | focus_range: 22..23, |
2444 | 22..23, | ||
2445 | ), | ||
2446 | name: "B", | 2404 | name: "B", |
2447 | kind: STRUCT, | 2405 | kind: Struct, |
2448 | container_name: None, | 2406 | description: "struct B", |
2449 | description: Some( | ||
2450 | "struct B", | ||
2451 | ), | ||
2452 | docs: None, | ||
2453 | }, | 2407 | }, |
2454 | }, | 2408 | }, |
2455 | HoverGotoTypeData { | 2409 | HoverGotoTypeData { |
@@ -2459,16 +2413,10 @@ fn main() { let s<|>t = (A(1), B(2), M::C(3) ); } | |||
2459 | 0, | 2413 | 0, |
2460 | ), | 2414 | ), |
2461 | full_range: 42..60, | 2415 | full_range: 42..60, |
2462 | focus_range: Some( | 2416 | focus_range: 53..54, |
2463 | 53..54, | ||
2464 | ), | ||
2465 | name: "C", | 2417 | name: "C", |
2466 | kind: STRUCT, | 2418 | kind: Struct, |
2467 | container_name: None, | 2419 | description: "pub struct C", |
2468 | description: Some( | ||
2469 | "pub struct C", | ||
2470 | ), | ||
2471 | docs: None, | ||
2472 | }, | 2420 | }, |
2473 | }, | 2421 | }, |
2474 | ], | 2422 | ], |
@@ -2498,16 +2446,10 @@ fn main() { let s<|>t = foo(); } | |||
2498 | 0, | 2446 | 0, |
2499 | ), | 2447 | ), |
2500 | full_range: 0..12, | 2448 | full_range: 0..12, |
2501 | focus_range: Some( | 2449 | focus_range: 6..9, |
2502 | 6..9, | ||
2503 | ), | ||
2504 | name: "Foo", | 2450 | name: "Foo", |
2505 | kind: TRAIT, | 2451 | kind: Trait, |
2506 | container_name: None, | 2452 | description: "trait Foo", |
2507 | description: Some( | ||
2508 | "trait Foo", | ||
2509 | ), | ||
2510 | docs: None, | ||
2511 | }, | 2453 | }, |
2512 | }, | 2454 | }, |
2513 | ], | 2455 | ], |
@@ -2538,16 +2480,10 @@ fn main() { let s<|>t = foo(); } | |||
2538 | 0, | 2480 | 0, |
2539 | ), | 2481 | ), |
2540 | full_range: 0..15, | 2482 | full_range: 0..15, |
2541 | focus_range: Some( | 2483 | focus_range: 6..9, |
2542 | 6..9, | ||
2543 | ), | ||
2544 | name: "Foo", | 2484 | name: "Foo", |
2545 | kind: TRAIT, | 2485 | kind: Trait, |
2546 | container_name: None, | 2486 | description: "trait Foo", |
2547 | description: Some( | ||
2548 | "trait Foo", | ||
2549 | ), | ||
2550 | docs: None, | ||
2551 | }, | 2487 | }, |
2552 | }, | 2488 | }, |
2553 | HoverGotoTypeData { | 2489 | HoverGotoTypeData { |
@@ -2557,16 +2493,10 @@ fn main() { let s<|>t = foo(); } | |||
2557 | 0, | 2493 | 0, |
2558 | ), | 2494 | ), |
2559 | full_range: 16..25, | 2495 | full_range: 16..25, |
2560 | focus_range: Some( | 2496 | focus_range: 23..24, |
2561 | 23..24, | ||
2562 | ), | ||
2563 | name: "S", | 2497 | name: "S", |
2564 | kind: STRUCT, | 2498 | kind: Struct, |
2565 | container_name: None, | 2499 | description: "struct S", |
2566 | description: Some( | ||
2567 | "struct S", | ||
2568 | ), | ||
2569 | docs: None, | ||
2570 | }, | 2500 | }, |
2571 | }, | 2501 | }, |
2572 | ], | 2502 | ], |
@@ -2597,16 +2527,10 @@ fn main() { let s<|>t = foo(); } | |||
2597 | 0, | 2527 | 0, |
2598 | ), | 2528 | ), |
2599 | full_range: 0..12, | 2529 | full_range: 0..12, |
2600 | focus_range: Some( | 2530 | focus_range: 6..9, |
2601 | 6..9, | ||
2602 | ), | ||
2603 | name: "Foo", | 2531 | name: "Foo", |
2604 | kind: TRAIT, | 2532 | kind: Trait, |
2605 | container_name: None, | 2533 | description: "trait Foo", |
2606 | description: Some( | ||
2607 | "trait Foo", | ||
2608 | ), | ||
2609 | docs: None, | ||
2610 | }, | 2534 | }, |
2611 | }, | 2535 | }, |
2612 | HoverGotoTypeData { | 2536 | HoverGotoTypeData { |
@@ -2616,16 +2540,10 @@ fn main() { let s<|>t = foo(); } | |||
2616 | 0, | 2540 | 0, |
2617 | ), | 2541 | ), |
2618 | full_range: 13..25, | 2542 | full_range: 13..25, |
2619 | focus_range: Some( | 2543 | focus_range: 19..22, |
2620 | 19..22, | ||
2621 | ), | ||
2622 | name: "Bar", | 2544 | name: "Bar", |
2623 | kind: TRAIT, | 2545 | kind: Trait, |
2624 | container_name: None, | 2546 | description: "trait Bar", |
2625 | description: Some( | ||
2626 | "trait Bar", | ||
2627 | ), | ||
2628 | docs: None, | ||
2629 | }, | 2547 | }, |
2630 | }, | 2548 | }, |
2631 | ], | 2549 | ], |
@@ -2659,16 +2577,10 @@ fn main() { let s<|>t = foo(); } | |||
2659 | 0, | 2577 | 0, |
2660 | ), | 2578 | ), |
2661 | full_range: 0..15, | 2579 | full_range: 0..15, |
2662 | focus_range: Some( | 2580 | focus_range: 6..9, |
2663 | 6..9, | ||
2664 | ), | ||
2665 | name: "Foo", | 2581 | name: "Foo", |
2666 | kind: TRAIT, | 2582 | kind: Trait, |
2667 | container_name: None, | 2583 | description: "trait Foo", |
2668 | description: Some( | ||
2669 | "trait Foo", | ||
2670 | ), | ||
2671 | docs: None, | ||
2672 | }, | 2584 | }, |
2673 | }, | 2585 | }, |
2674 | HoverGotoTypeData { | 2586 | HoverGotoTypeData { |
@@ -2678,16 +2590,10 @@ fn main() { let s<|>t = foo(); } | |||
2678 | 0, | 2590 | 0, |
2679 | ), | 2591 | ), |
2680 | full_range: 16..31, | 2592 | full_range: 16..31, |
2681 | focus_range: Some( | 2593 | focus_range: 22..25, |
2682 | 22..25, | ||
2683 | ), | ||
2684 | name: "Bar", | 2594 | name: "Bar", |
2685 | kind: TRAIT, | 2595 | kind: Trait, |
2686 | container_name: None, | 2596 | description: "trait Bar", |
2687 | description: Some( | ||
2688 | "trait Bar", | ||
2689 | ), | ||
2690 | docs: None, | ||
2691 | }, | 2597 | }, |
2692 | }, | 2598 | }, |
2693 | HoverGotoTypeData { | 2599 | HoverGotoTypeData { |
@@ -2697,16 +2603,10 @@ fn main() { let s<|>t = foo(); } | |||
2697 | 0, | 2603 | 0, |
2698 | ), | 2604 | ), |
2699 | full_range: 32..44, | 2605 | full_range: 32..44, |
2700 | focus_range: Some( | 2606 | focus_range: 39..41, |
2701 | 39..41, | ||
2702 | ), | ||
2703 | name: "S1", | 2607 | name: "S1", |
2704 | kind: STRUCT, | 2608 | kind: Struct, |
2705 | container_name: None, | 2609 | description: "struct S1", |
2706 | description: Some( | ||
2707 | "struct S1", | ||
2708 | ), | ||
2709 | docs: None, | ||
2710 | }, | 2610 | }, |
2711 | }, | 2611 | }, |
2712 | HoverGotoTypeData { | 2612 | HoverGotoTypeData { |
@@ -2716,16 +2616,10 @@ fn main() { let s<|>t = foo(); } | |||
2716 | 0, | 2616 | 0, |
2717 | ), | 2617 | ), |
2718 | full_range: 45..57, | 2618 | full_range: 45..57, |
2719 | focus_range: Some( | 2619 | focus_range: 52..54, |
2720 | 52..54, | ||
2721 | ), | ||
2722 | name: "S2", | 2620 | name: "S2", |
2723 | kind: STRUCT, | 2621 | kind: Struct, |
2724 | container_name: None, | 2622 | description: "struct S2", |
2725 | description: Some( | ||
2726 | "struct S2", | ||
2727 | ), | ||
2728 | docs: None, | ||
2729 | }, | 2623 | }, |
2730 | }, | 2624 | }, |
2731 | ], | 2625 | ], |
@@ -2753,16 +2647,10 @@ fn foo(ar<|>g: &impl Foo) {} | |||
2753 | 0, | 2647 | 0, |
2754 | ), | 2648 | ), |
2755 | full_range: 0..12, | 2649 | full_range: 0..12, |
2756 | focus_range: Some( | 2650 | focus_range: 6..9, |
2757 | 6..9, | ||
2758 | ), | ||
2759 | name: "Foo", | 2651 | name: "Foo", |
2760 | kind: TRAIT, | 2652 | kind: Trait, |
2761 | container_name: None, | 2653 | description: "trait Foo", |
2762 | description: Some( | ||
2763 | "trait Foo", | ||
2764 | ), | ||
2765 | docs: None, | ||
2766 | }, | 2654 | }, |
2767 | }, | 2655 | }, |
2768 | ], | 2656 | ], |
@@ -2793,16 +2681,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {} | |||
2793 | 0, | 2681 | 0, |
2794 | ), | 2682 | ), |
2795 | full_range: 0..12, | 2683 | full_range: 0..12, |
2796 | focus_range: Some( | 2684 | focus_range: 6..9, |
2797 | 6..9, | ||
2798 | ), | ||
2799 | name: "Foo", | 2685 | name: "Foo", |
2800 | kind: TRAIT, | 2686 | kind: Trait, |
2801 | container_name: None, | 2687 | description: "trait Foo", |
2802 | description: Some( | ||
2803 | "trait Foo", | ||
2804 | ), | ||
2805 | docs: None, | ||
2806 | }, | 2688 | }, |
2807 | }, | 2689 | }, |
2808 | HoverGotoTypeData { | 2690 | HoverGotoTypeData { |
@@ -2812,16 +2694,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {} | |||
2812 | 0, | 2694 | 0, |
2813 | ), | 2695 | ), |
2814 | full_range: 13..28, | 2696 | full_range: 13..28, |
2815 | focus_range: Some( | 2697 | focus_range: 19..22, |
2816 | 19..22, | ||
2817 | ), | ||
2818 | name: "Bar", | 2698 | name: "Bar", |
2819 | kind: TRAIT, | 2699 | kind: Trait, |
2820 | container_name: None, | 2700 | description: "trait Bar", |
2821 | description: Some( | ||
2822 | "trait Bar", | ||
2823 | ), | ||
2824 | docs: None, | ||
2825 | }, | 2701 | }, |
2826 | }, | 2702 | }, |
2827 | HoverGotoTypeData { | 2703 | HoverGotoTypeData { |
@@ -2831,16 +2707,10 @@ fn foo(ar<|>g: &impl Foo + Bar<S>) {} | |||
2831 | 0, | 2707 | 0, |
2832 | ), | 2708 | ), |
2833 | full_range: 29..39, | 2709 | full_range: 29..39, |
2834 | focus_range: Some( | 2710 | focus_range: 36..37, |
2835 | 36..37, | ||
2836 | ), | ||
2837 | name: "S", | 2711 | name: "S", |
2838 | kind: STRUCT, | 2712 | kind: Struct, |
2839 | container_name: None, | 2713 | description: "struct S", |
2840 | description: Some( | ||
2841 | "struct S", | ||
2842 | ), | ||
2843 | docs: None, | ||
2844 | }, | 2714 | }, |
2845 | }, | 2715 | }, |
2846 | ], | 2716 | ], |
@@ -2876,16 +2746,10 @@ mod future { | |||
2876 | 0, | 2746 | 0, |
2877 | ), | 2747 | ), |
2878 | full_range: 101..163, | 2748 | full_range: 101..163, |
2879 | focus_range: Some( | 2749 | focus_range: 140..146, |
2880 | 140..146, | ||
2881 | ), | ||
2882 | name: "Future", | 2750 | name: "Future", |
2883 | kind: TRAIT, | 2751 | kind: Trait, |
2884 | container_name: None, | 2752 | description: "pub trait Future", |
2885 | description: Some( | ||
2886 | "pub trait Future", | ||
2887 | ), | ||
2888 | docs: None, | ||
2889 | }, | 2753 | }, |
2890 | }, | 2754 | }, |
2891 | HoverGotoTypeData { | 2755 | HoverGotoTypeData { |
@@ -2895,16 +2759,10 @@ mod future { | |||
2895 | 0, | 2759 | 0, |
2896 | ), | 2760 | ), |
2897 | full_range: 0..9, | 2761 | full_range: 0..9, |
2898 | focus_range: Some( | 2762 | focus_range: 7..8, |
2899 | 7..8, | ||
2900 | ), | ||
2901 | name: "S", | 2763 | name: "S", |
2902 | kind: STRUCT, | 2764 | kind: Struct, |
2903 | container_name: None, | 2765 | description: "struct S", |
2904 | description: Some( | ||
2905 | "struct S", | ||
2906 | ), | ||
2907 | docs: None, | ||
2908 | }, | 2766 | }, |
2909 | }, | 2767 | }, |
2910 | ], | 2768 | ], |
@@ -2933,16 +2791,10 @@ fn foo(ar<|>g: &impl Foo<S>) {} | |||
2933 | 0, | 2791 | 0, |
2934 | ), | 2792 | ), |
2935 | full_range: 0..15, | 2793 | full_range: 0..15, |
2936 | focus_range: Some( | 2794 | focus_range: 6..9, |
2937 | 6..9, | ||
2938 | ), | ||
2939 | name: "Foo", | 2795 | name: "Foo", |
2940 | kind: TRAIT, | 2796 | kind: Trait, |
2941 | container_name: None, | 2797 | description: "trait Foo", |
2942 | description: Some( | ||
2943 | "trait Foo", | ||
2944 | ), | ||
2945 | docs: None, | ||
2946 | }, | 2798 | }, |
2947 | }, | 2799 | }, |
2948 | HoverGotoTypeData { | 2800 | HoverGotoTypeData { |
@@ -2952,16 +2804,10 @@ fn foo(ar<|>g: &impl Foo<S>) {} | |||
2952 | 0, | 2804 | 0, |
2953 | ), | 2805 | ), |
2954 | full_range: 16..27, | 2806 | full_range: 16..27, |
2955 | focus_range: Some( | 2807 | focus_range: 23..24, |
2956 | 23..24, | ||
2957 | ), | ||
2958 | name: "S", | 2808 | name: "S", |
2959 | kind: STRUCT, | 2809 | kind: Struct, |
2960 | container_name: None, | 2810 | description: "struct S", |
2961 | description: Some( | ||
2962 | "struct S", | ||
2963 | ), | ||
2964 | docs: None, | ||
2965 | }, | 2811 | }, |
2966 | }, | 2812 | }, |
2967 | ], | 2813 | ], |
@@ -2995,16 +2841,10 @@ fn main() { let s<|>t = foo(); } | |||
2995 | 0, | 2841 | 0, |
2996 | ), | 2842 | ), |
2997 | full_range: 42..55, | 2843 | full_range: 42..55, |
2998 | focus_range: Some( | 2844 | focus_range: 49..50, |
2999 | 49..50, | ||
3000 | ), | ||
3001 | name: "B", | 2845 | name: "B", |
3002 | kind: STRUCT, | 2846 | kind: Struct, |
3003 | container_name: None, | 2847 | description: "struct B", |
3004 | description: Some( | ||
3005 | "struct B", | ||
3006 | ), | ||
3007 | docs: None, | ||
3008 | }, | 2848 | }, |
3009 | }, | 2849 | }, |
3010 | HoverGotoTypeData { | 2850 | HoverGotoTypeData { |
@@ -3014,16 +2854,10 @@ fn main() { let s<|>t = foo(); } | |||
3014 | 0, | 2854 | 0, |
3015 | ), | 2855 | ), |
3016 | full_range: 0..12, | 2856 | full_range: 0..12, |
3017 | focus_range: Some( | 2857 | focus_range: 6..9, |
3018 | 6..9, | ||
3019 | ), | ||
3020 | name: "Foo", | 2858 | name: "Foo", |
3021 | kind: TRAIT, | 2859 | kind: Trait, |
3022 | container_name: None, | 2860 | description: "trait Foo", |
3023 | description: Some( | ||
3024 | "trait Foo", | ||
3025 | ), | ||
3026 | docs: None, | ||
3027 | }, | 2861 | }, |
3028 | }, | 2862 | }, |
3029 | ], | 2863 | ], |
@@ -3051,16 +2885,10 @@ fn foo(ar<|>g: &dyn Foo) {} | |||
3051 | 0, | 2885 | 0, |
3052 | ), | 2886 | ), |
3053 | full_range: 0..12, | 2887 | full_range: 0..12, |
3054 | focus_range: Some( | 2888 | focus_range: 6..9, |
3055 | 6..9, | ||
3056 | ), | ||
3057 | name: "Foo", | 2889 | name: "Foo", |
3058 | kind: TRAIT, | 2890 | kind: Trait, |
3059 | container_name: None, | 2891 | description: "trait Foo", |
3060 | description: Some( | ||
3061 | "trait Foo", | ||
3062 | ), | ||
3063 | docs: None, | ||
3064 | }, | 2892 | }, |
3065 | }, | 2893 | }, |
3066 | ], | 2894 | ], |
@@ -3089,16 +2917,10 @@ fn foo(ar<|>g: &dyn Foo<S>) {} | |||
3089 | 0, | 2917 | 0, |
3090 | ), | 2918 | ), |
3091 | full_range: 0..15, | 2919 | full_range: 0..15, |
3092 | focus_range: Some( | 2920 | focus_range: 6..9, |
3093 | 6..9, | ||
3094 | ), | ||
3095 | name: "Foo", | 2921 | name: "Foo", |
3096 | kind: TRAIT, | 2922 | kind: Trait, |
3097 | container_name: None, | 2923 | description: "trait Foo", |
3098 | description: Some( | ||
3099 | "trait Foo", | ||
3100 | ), | ||
3101 | docs: None, | ||
3102 | }, | 2924 | }, |
3103 | }, | 2925 | }, |
3104 | HoverGotoTypeData { | 2926 | HoverGotoTypeData { |
@@ -3108,16 +2930,10 @@ fn foo(ar<|>g: &dyn Foo<S>) {} | |||
3108 | 0, | 2930 | 0, |
3109 | ), | 2931 | ), |
3110 | full_range: 16..27, | 2932 | full_range: 16..27, |
3111 | focus_range: Some( | 2933 | focus_range: 23..24, |
3112 | 23..24, | ||
3113 | ), | ||
3114 | name: "S", | 2934 | name: "S", |
3115 | kind: STRUCT, | 2935 | kind: Struct, |
3116 | container_name: None, | 2936 | description: "struct S", |
3117 | description: Some( | ||
3118 | "struct S", | ||
3119 | ), | ||
3120 | docs: None, | ||
3121 | }, | 2937 | }, |
3122 | }, | 2938 | }, |
3123 | ], | 2939 | ], |
@@ -3149,16 +2965,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {} | |||
3149 | 0, | 2965 | 0, |
3150 | ), | 2966 | ), |
3151 | full_range: 0..21, | 2967 | full_range: 0..21, |
3152 | focus_range: Some( | 2968 | focus_range: 6..15, |
3153 | 6..15, | ||
3154 | ), | ||
3155 | name: "ImplTrait", | 2969 | name: "ImplTrait", |
3156 | kind: TRAIT, | 2970 | kind: Trait, |
3157 | container_name: None, | 2971 | description: "trait ImplTrait", |
3158 | description: Some( | ||
3159 | "trait ImplTrait", | ||
3160 | ), | ||
3161 | docs: None, | ||
3162 | }, | 2972 | }, |
3163 | }, | 2973 | }, |
3164 | HoverGotoTypeData { | 2974 | HoverGotoTypeData { |
@@ -3168,16 +2978,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {} | |||
3168 | 0, | 2978 | 0, |
3169 | ), | 2979 | ), |
3170 | full_range: 43..57, | 2980 | full_range: 43..57, |
3171 | focus_range: Some( | 2981 | focus_range: 50..51, |
3172 | 50..51, | ||
3173 | ), | ||
3174 | name: "B", | 2982 | name: "B", |
3175 | kind: STRUCT, | 2983 | kind: Struct, |
3176 | container_name: None, | 2984 | description: "struct B", |
3177 | description: Some( | ||
3178 | "struct B", | ||
3179 | ), | ||
3180 | docs: None, | ||
3181 | }, | 2985 | }, |
3182 | }, | 2986 | }, |
3183 | HoverGotoTypeData { | 2987 | HoverGotoTypeData { |
@@ -3187,16 +2991,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {} | |||
3187 | 0, | 2991 | 0, |
3188 | ), | 2992 | ), |
3189 | full_range: 22..42, | 2993 | full_range: 22..42, |
3190 | focus_range: Some( | 2994 | focus_range: 28..36, |
3191 | 28..36, | ||
3192 | ), | ||
3193 | name: "DynTrait", | 2995 | name: "DynTrait", |
3194 | kind: TRAIT, | 2996 | kind: Trait, |
3195 | container_name: None, | 2997 | description: "trait DynTrait", |
3196 | description: Some( | ||
3197 | "trait DynTrait", | ||
3198 | ), | ||
3199 | docs: None, | ||
3200 | }, | 2998 | }, |
3201 | }, | 2999 | }, |
3202 | HoverGotoTypeData { | 3000 | HoverGotoTypeData { |
@@ -3206,16 +3004,10 @@ fn foo(a<|>rg: &impl ImplTrait<B<dyn DynTrait<B<S>>>>) {} | |||
3206 | 0, | 3004 | 0, |
3207 | ), | 3005 | ), |
3208 | full_range: 58..69, | 3006 | full_range: 58..69, |
3209 | focus_range: Some( | 3007 | focus_range: 65..66, |
3210 | 65..66, | ||
3211 | ), | ||
3212 | name: "S", | 3008 | name: "S", |
3213 | kind: STRUCT, | 3009 | kind: Struct, |
3214 | container_name: None, | 3010 | description: "struct S", |
3215 | description: Some( | ||
3216 | "struct S", | ||
3217 | ), | ||
3218 | docs: None, | ||
3219 | }, | 3011 | }, |
3220 | }, | 3012 | }, |
3221 | ], | 3013 | ], |
@@ -3254,16 +3046,10 @@ fn main() { let s<|>t = test().get(); } | |||
3254 | 0, | 3046 | 0, |
3255 | ), | 3047 | ), |
3256 | full_range: 0..62, | 3048 | full_range: 0..62, |
3257 | focus_range: Some( | 3049 | focus_range: 6..9, |
3258 | 6..9, | ||
3259 | ), | ||
3260 | name: "Foo", | 3050 | name: "Foo", |
3261 | kind: TRAIT, | 3051 | kind: Trait, |
3262 | container_name: None, | 3052 | description: "trait Foo", |
3263 | description: Some( | ||
3264 | "trait Foo", | ||
3265 | ), | ||
3266 | docs: None, | ||
3267 | }, | 3053 | }, |
3268 | }, | 3054 | }, |
3269 | ], | 3055 | ], |
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index c5c652cda..dbad9a84f 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -57,14 +57,14 @@ use ide_db::{ | |||
57 | symbol_index::{self, FileSymbol}, | 57 | symbol_index::{self, FileSymbol}, |
58 | LineIndexDatabase, | 58 | LineIndexDatabase, |
59 | }; | 59 | }; |
60 | use syntax::{SourceFile, TextRange, TextSize}; | 60 | use syntax::SourceFile; |
61 | 61 | ||
62 | use crate::display::ToNav; | 62 | use crate::display::ToNav; |
63 | 63 | ||
64 | pub use crate::{ | 64 | pub use crate::{ |
65 | call_hierarchy::CallItem, | 65 | call_hierarchy::CallItem, |
66 | diagnostics::{Diagnostic, DiagnosticsConfig, Fix, Severity}, | 66 | diagnostics::{Diagnostic, DiagnosticsConfig, Fix, Severity}, |
67 | display::NavigationTarget, | 67 | display::navigation_target::{NavigationTarget, SymbolKind}, |
68 | expand_macro::ExpandedMacro, | 68 | expand_macro::ExpandedMacro, |
69 | file_structure::StructureNode, | 69 | file_structure::StructureNode, |
70 | folding_ranges::{Fold, FoldKind}, | 70 | folding_ranges::{Fold, FoldKind}, |
@@ -79,22 +79,21 @@ pub use crate::{ | |||
79 | HighlightedRange, | 79 | HighlightedRange, |
80 | }, | 80 | }, |
81 | }; | 81 | }; |
82 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
82 | pub use completion::{ | 83 | pub use completion::{ |
83 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability, | 84 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability, |
84 | CompletionScore, ImportEdit, InsertTextFormat, | 85 | CompletionScore, ImportEdit, InsertTextFormat, |
85 | }; | 86 | }; |
86 | pub use ide_db::{ | ||
87 | call_info::CallInfo, | ||
88 | search::{Reference, ReferenceAccess, ReferenceKind}, | ||
89 | }; | ||
90 | |||
91 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
92 | pub use hir::{Documentation, Semantics}; | 87 | pub use hir::{Documentation, Semantics}; |
93 | pub use ide_db::base_db::{ | 88 | pub use ide_db::base_db::{ |
94 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, | 89 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, |
95 | SourceRootId, | 90 | SourceRootId, |
96 | }; | 91 | }; |
97 | pub use ide_db::{ | 92 | pub use ide_db::{ |
93 | call_info::CallInfo, | ||
94 | search::{Reference, ReferenceAccess, ReferenceKind}, | ||
95 | }; | ||
96 | pub use ide_db::{ | ||
98 | label::Label, | 97 | label::Label, |
99 | line_index::{LineCol, LineIndex}, | 98 | line_index::{LineCol, LineIndex}, |
100 | search::SearchScope, | 99 | search::SearchScope, |
@@ -103,6 +102,7 @@ pub use ide_db::{ | |||
103 | RootDatabase, | 102 | RootDatabase, |
104 | }; | 103 | }; |
105 | pub use ssr::SsrError; | 104 | pub use ssr::SsrError; |
105 | pub use syntax::{TextRange, TextSize}; | ||
106 | pub use text_edit::{Indel, TextEdit}; | 106 | pub use text_edit::{Indel, TextEdit}; |
107 | 107 | ||
108 | pub type Cancelable<T> = Result<T, Canceled>; | 108 | pub type Cancelable<T> = Result<T, Canceled>; |
diff --git a/crates/ide/src/parent_module.rs b/crates/ide/src/parent_module.rs index 6cc3b2991..be344a09b 100644 --- a/crates/ide/src/parent_module.rs +++ b/crates/ide/src/parent_module.rs | |||
@@ -78,7 +78,7 @@ mod tests { | |||
78 | ", | 78 | ", |
79 | ); | 79 | ); |
80 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); | 80 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); |
81 | nav.assert_match("foo MODULE FileId(0) 0..8"); | 81 | nav.assert_match("foo Module FileId(0) 0..8"); |
82 | } | 82 | } |
83 | 83 | ||
84 | #[test] | 84 | #[test] |
@@ -97,7 +97,7 @@ mod tests { | |||
97 | ", | 97 | ", |
98 | ); | 98 | ); |
99 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); | 99 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); |
100 | nav.assert_match("foo MODULE FileId(0) 0..8"); | 100 | nav.assert_match("foo Module FileId(0) 0..8"); |
101 | } | 101 | } |
102 | 102 | ||
103 | #[test] | 103 | #[test] |
@@ -113,7 +113,7 @@ mod tests { | |||
113 | ", | 113 | ", |
114 | ); | 114 | ); |
115 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); | 115 | let nav = analysis.parent_module(pos).unwrap().pop().unwrap(); |
116 | nav.assert_match("baz MODULE FileId(0) 32..44"); | 116 | nav.assert_match("baz Module FileId(0) 32..44"); |
117 | } | 117 | } |
118 | 118 | ||
119 | #[test] | 119 | #[test] |
diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs index 98190a86b..18ea19305 100644 --- a/crates/ide/src/references.rs +++ b/crates/ide/src/references.rs | |||
@@ -24,7 +24,7 @@ use syntax::{ | |||
24 | match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset, | 24 | match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset, |
25 | }; | 25 | }; |
26 | 26 | ||
27 | use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo}; | 27 | use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo, SymbolKind}; |
28 | 28 | ||
29 | #[derive(Debug, Clone)] | 29 | #[derive(Debug, Clone)] |
30 | pub struct ReferenceSearchResult { | 30 | pub struct ReferenceSearchResult { |
@@ -278,7 +278,7 @@ fn try_find_self_references( | |||
278 | full_range: self_param.syntax().text_range(), | 278 | full_range: self_param.syntax().text_range(), |
279 | focus_range: Some(param_self_token.text_range()), | 279 | focus_range: Some(param_self_token.text_range()), |
280 | name: param_self_token.text().clone(), | 280 | name: param_self_token.text().clone(), |
281 | kind: param_self_token.kind(), | 281 | kind: Some(SymbolKind::SelfParam), |
282 | container_name: None, | 282 | container_name: None, |
283 | description: None, | 283 | description: None, |
284 | docs: None, | 284 | docs: None, |
@@ -343,7 +343,7 @@ fn main() { | |||
343 | } | 343 | } |
344 | "#, | 344 | "#, |
345 | expect![[r#" | 345 | expect![[r#" |
346 | Foo STRUCT FileId(0) 0..26 7..10 Other | 346 | Foo Struct FileId(0) 0..26 7..10 Other |
347 | 347 | ||
348 | FileId(0) 101..104 StructLiteral | 348 | FileId(0) 101..104 StructLiteral |
349 | "#]], | 349 | "#]], |
@@ -361,7 +361,7 @@ struct Foo<|> {} | |||
361 | } | 361 | } |
362 | "#, | 362 | "#, |
363 | expect![[r#" | 363 | expect![[r#" |
364 | Foo STRUCT FileId(0) 0..13 7..10 Other | 364 | Foo Struct FileId(0) 0..13 7..10 Other |
365 | 365 | ||
366 | FileId(0) 41..44 Other | 366 | FileId(0) 41..44 Other |
367 | FileId(0) 54..57 StructLiteral | 367 | FileId(0) 54..57 StructLiteral |
@@ -380,7 +380,7 @@ struct Foo<T> <|>{} | |||
380 | } | 380 | } |
381 | "#, | 381 | "#, |
382 | expect![[r#" | 382 | expect![[r#" |
383 | Foo STRUCT FileId(0) 0..16 7..10 Other | 383 | Foo Struct FileId(0) 0..16 7..10 Other |
384 | 384 | ||
385 | FileId(0) 64..67 StructLiteral | 385 | FileId(0) 64..67 StructLiteral |
386 | "#]], | 386 | "#]], |
@@ -399,7 +399,7 @@ fn main() { | |||
399 | } | 399 | } |
400 | "#, | 400 | "#, |
401 | expect![[r#" | 401 | expect![[r#" |
402 | Foo STRUCT FileId(0) 0..16 7..10 Other | 402 | Foo Struct FileId(0) 0..16 7..10 Other |
403 | 403 | ||
404 | FileId(0) 54..57 StructLiteral | 404 | FileId(0) 54..57 StructLiteral |
405 | "#]], | 405 | "#]], |
@@ -420,7 +420,7 @@ fn main() { | |||
420 | } | 420 | } |
421 | "#, | 421 | "#, |
422 | expect![[r#" | 422 | expect![[r#" |
423 | Foo ENUM FileId(0) 0..26 5..8 Other | 423 | Foo Enum FileId(0) 0..26 5..8 Other |
424 | 424 | ||
425 | FileId(0) 63..66 EnumLiteral | 425 | FileId(0) 63..66 EnumLiteral |
426 | "#]], | 426 | "#]], |
@@ -441,7 +441,7 @@ fn main() { | |||
441 | } | 441 | } |
442 | "#, | 442 | "#, |
443 | expect![[r#" | 443 | expect![[r#" |
444 | Foo ENUM FileId(0) 0..26 5..8 Other | 444 | Foo Enum FileId(0) 0..26 5..8 Other |
445 | 445 | ||
446 | FileId(0) 50..53 Other | 446 | FileId(0) 50..53 Other |
447 | FileId(0) 63..66 EnumLiteral | 447 | FileId(0) 63..66 EnumLiteral |
@@ -463,7 +463,7 @@ fn main() { | |||
463 | } | 463 | } |
464 | "#, | 464 | "#, |
465 | expect![[r#" | 465 | expect![[r#" |
466 | Foo ENUM FileId(0) 0..32 5..8 Other | 466 | Foo Enum FileId(0) 0..32 5..8 Other |
467 | 467 | ||
468 | FileId(0) 73..76 EnumLiteral | 468 | FileId(0) 73..76 EnumLiteral |
469 | "#]], | 469 | "#]], |
@@ -484,7 +484,7 @@ fn main() { | |||
484 | } | 484 | } |
485 | "#, | 485 | "#, |
486 | expect![[r#" | 486 | expect![[r#" |
487 | Foo ENUM FileId(0) 0..33 5..8 Other | 487 | Foo Enum FileId(0) 0..33 5..8 Other |
488 | 488 | ||
489 | FileId(0) 70..73 EnumLiteral | 489 | FileId(0) 70..73 EnumLiteral |
490 | "#]], | 490 | "#]], |
@@ -507,7 +507,7 @@ fn main() { | |||
507 | i = 5; | 507 | i = 5; |
508 | }"#, | 508 | }"#, |
509 | expect![[r#" | 509 | expect![[r#" |
510 | i IDENT_PAT FileId(0) 24..25 Other Write | 510 | i Local FileId(0) 24..25 Other Write |
511 | 511 | ||
512 | FileId(0) 50..51 Other Write | 512 | FileId(0) 50..51 Other Write |
513 | FileId(0) 54..55 Other Read | 513 | FileId(0) 54..55 Other Read |
@@ -531,7 +531,7 @@ fn bar() { | |||
531 | } | 531 | } |
532 | "#, | 532 | "#, |
533 | expect![[r#" | 533 | expect![[r#" |
534 | spam IDENT_PAT FileId(0) 19..23 Other | 534 | spam Local FileId(0) 19..23 Other |
535 | 535 | ||
536 | FileId(0) 34..38 Other Read | 536 | FileId(0) 34..38 Other Read |
537 | FileId(0) 41..45 Other Read | 537 | FileId(0) 41..45 Other Read |
@@ -546,7 +546,7 @@ fn bar() { | |||
546 | fn foo(i : u32) -> u32 { i<|> } | 546 | fn foo(i : u32) -> u32 { i<|> } |
547 | "#, | 547 | "#, |
548 | expect![[r#" | 548 | expect![[r#" |
549 | i IDENT_PAT FileId(0) 7..8 Other | 549 | i ValueParam FileId(0) 7..8 Other |
550 | 550 | ||
551 | FileId(0) 25..26 Other Read | 551 | FileId(0) 25..26 Other Read |
552 | "#]], | 552 | "#]], |
@@ -560,7 +560,7 @@ fn foo(i : u32) -> u32 { i<|> } | |||
560 | fn foo(i<|> : u32) -> u32 { i } | 560 | fn foo(i<|> : u32) -> u32 { i } |
561 | "#, | 561 | "#, |
562 | expect![[r#" | 562 | expect![[r#" |
563 | i IDENT_PAT FileId(0) 7..8 Other | 563 | i ValueParam FileId(0) 7..8 Other |
564 | 564 | ||
565 | FileId(0) 25..26 Other Read | 565 | FileId(0) 25..26 Other Read |
566 | "#]], | 566 | "#]], |
@@ -581,7 +581,7 @@ fn main(s: Foo) { | |||
581 | } | 581 | } |
582 | "#, | 582 | "#, |
583 | expect![[r#" | 583 | expect![[r#" |
584 | spam RECORD_FIELD FileId(0) 17..30 21..25 Other | 584 | spam Field FileId(0) 17..30 21..25 Other |
585 | 585 | ||
586 | FileId(0) 67..71 Other Read | 586 | FileId(0) 67..71 Other Read |
587 | "#]], | 587 | "#]], |
@@ -598,7 +598,7 @@ impl Foo { | |||
598 | } | 598 | } |
599 | "#, | 599 | "#, |
600 | expect![[r#" | 600 | expect![[r#" |
601 | f FN FileId(0) 27..43 30..31 Other | 601 | f Function FileId(0) 27..43 30..31 Other |
602 | 602 | ||
603 | "#]], | 603 | "#]], |
604 | ); | 604 | ); |
@@ -615,7 +615,7 @@ enum Foo { | |||
615 | } | 615 | } |
616 | "#, | 616 | "#, |
617 | expect![[r#" | 617 | expect![[r#" |
618 | B VARIANT FileId(0) 22..23 22..23 Other | 618 | B Variant FileId(0) 22..23 22..23 Other |
619 | 619 | ||
620 | "#]], | 620 | "#]], |
621 | ); | 621 | ); |
@@ -632,7 +632,7 @@ enum Foo { | |||
632 | } | 632 | } |
633 | "#, | 633 | "#, |
634 | expect![[r#" | 634 | expect![[r#" |
635 | field RECORD_FIELD FileId(0) 26..35 26..31 Other | 635 | field Field FileId(0) 26..35 26..31 Other |
636 | 636 | ||
637 | "#]], | 637 | "#]], |
638 | ); | 638 | ); |
@@ -673,7 +673,7 @@ fn f() { | |||
673 | } | 673 | } |
674 | "#, | 674 | "#, |
675 | expect![[r#" | 675 | expect![[r#" |
676 | Foo STRUCT FileId(1) 17..51 28..31 Other | 676 | Foo Struct FileId(1) 17..51 28..31 Other |
677 | 677 | ||
678 | FileId(0) 53..56 StructLiteral | 678 | FileId(0) 53..56 StructLiteral |
679 | FileId(2) 79..82 StructLiteral | 679 | FileId(2) 79..82 StructLiteral |
@@ -703,7 +703,7 @@ pub struct Foo { | |||
703 | } | 703 | } |
704 | "#, | 704 | "#, |
705 | expect![[r#" | 705 | expect![[r#" |
706 | foo SOURCE_FILE FileId(1) 0..35 Other | 706 | foo Module FileId(1) 0..35 Other |
707 | 707 | ||
708 | FileId(0) 14..17 Other | 708 | FileId(0) 14..17 Other |
709 | "#]], | 709 | "#]], |
@@ -731,7 +731,7 @@ pub(super) struct Foo<|> { | |||
731 | } | 731 | } |
732 | "#, | 732 | "#, |
733 | expect![[r#" | 733 | expect![[r#" |
734 | Foo STRUCT FileId(2) 0..41 18..21 Other | 734 | Foo Struct FileId(2) 0..41 18..21 Other |
735 | 735 | ||
736 | FileId(1) 20..23 Other | 736 | FileId(1) 20..23 Other |
737 | FileId(1) 47..50 StructLiteral | 737 | FileId(1) 47..50 StructLiteral |
@@ -759,7 +759,7 @@ pub(super) struct Foo<|> { | |||
759 | code, | 759 | code, |
760 | None, | 760 | None, |
761 | expect![[r#" | 761 | expect![[r#" |
762 | quux FN FileId(0) 19..35 26..30 Other | 762 | quux Function FileId(0) 19..35 26..30 Other |
763 | 763 | ||
764 | FileId(1) 16..20 StructLiteral | 764 | FileId(1) 16..20 StructLiteral |
765 | FileId(2) 16..20 StructLiteral | 765 | FileId(2) 16..20 StructLiteral |
@@ -770,7 +770,7 @@ pub(super) struct Foo<|> { | |||
770 | code, | 770 | code, |
771 | Some(SearchScope::single_file(FileId(2))), | 771 | Some(SearchScope::single_file(FileId(2))), |
772 | expect![[r#" | 772 | expect![[r#" |
773 | quux FN FileId(0) 19..35 26..30 Other | 773 | quux Function FileId(0) 19..35 26..30 Other |
774 | 774 | ||
775 | FileId(2) 16..20 StructLiteral | 775 | FileId(2) 16..20 StructLiteral |
776 | "#]], | 776 | "#]], |
@@ -790,7 +790,7 @@ fn foo() { | |||
790 | } | 790 | } |
791 | "#, | 791 | "#, |
792 | expect![[r#" | 792 | expect![[r#" |
793 | m1 MACRO_RULES FileId(0) 0..46 29..31 Other | 793 | m1 Macro FileId(0) 0..46 29..31 Other |
794 | 794 | ||
795 | FileId(0) 63..65 StructLiteral | 795 | FileId(0) 63..65 StructLiteral |
796 | FileId(0) 73..75 StructLiteral | 796 | FileId(0) 73..75 StructLiteral |
@@ -808,7 +808,7 @@ fn foo() { | |||
808 | } | 808 | } |
809 | "#, | 809 | "#, |
810 | expect![[r#" | 810 | expect![[r#" |
811 | i IDENT_PAT FileId(0) 23..24 Other Write | 811 | i Local FileId(0) 23..24 Other Write |
812 | 812 | ||
813 | FileId(0) 34..35 Other Write | 813 | FileId(0) 34..35 Other Write |
814 | FileId(0) 38..39 Other Read | 814 | FileId(0) 38..39 Other Read |
@@ -830,7 +830,7 @@ fn foo() { | |||
830 | } | 830 | } |
831 | "#, | 831 | "#, |
832 | expect![[r#" | 832 | expect![[r#" |
833 | f RECORD_FIELD FileId(0) 15..21 15..16 Other | 833 | f Field FileId(0) 15..21 15..16 Other |
834 | 834 | ||
835 | FileId(0) 55..56 RecordFieldExprOrPat Read | 835 | FileId(0) 55..56 RecordFieldExprOrPat Read |
836 | FileId(0) 68..69 Other Write | 836 | FileId(0) 68..69 Other Write |
@@ -848,7 +848,7 @@ fn foo() { | |||
848 | } | 848 | } |
849 | "#, | 849 | "#, |
850 | expect![[r#" | 850 | expect![[r#" |
851 | i IDENT_PAT FileId(0) 19..20 Other | 851 | i Local FileId(0) 19..20 Other |
852 | 852 | ||
853 | FileId(0) 26..27 Other Write | 853 | FileId(0) 26..27 Other Write |
854 | "#]], | 854 | "#]], |
@@ -872,7 +872,7 @@ fn main() { | |||
872 | } | 872 | } |
873 | "#, | 873 | "#, |
874 | expect![[r#" | 874 | expect![[r#" |
875 | new FN FileId(0) 54..81 61..64 Other | 875 | new Function FileId(0) 54..81 61..64 Other |
876 | 876 | ||
877 | FileId(0) 126..129 StructLiteral | 877 | FileId(0) 126..129 StructLiteral |
878 | "#]], | 878 | "#]], |
@@ -894,7 +894,7 @@ use crate::f; | |||
894 | fn g() { f(); } | 894 | fn g() { f(); } |
895 | "#, | 895 | "#, |
896 | expect![[r#" | 896 | expect![[r#" |
897 | f FN FileId(0) 22..31 25..26 Other | 897 | f Function FileId(0) 22..31 25..26 Other |
898 | 898 | ||
899 | FileId(1) 11..12 Other | 899 | FileId(1) 11..12 Other |
900 | FileId(1) 24..25 StructLiteral | 900 | FileId(1) 24..25 StructLiteral |
@@ -917,7 +917,7 @@ fn f(s: S) { | |||
917 | } | 917 | } |
918 | "#, | 918 | "#, |
919 | expect![[r#" | 919 | expect![[r#" |
920 | field RECORD_FIELD FileId(0) 15..24 15..20 Other | 920 | field Field FileId(0) 15..24 15..20 Other |
921 | 921 | ||
922 | FileId(0) 68..73 FieldShorthandForField Read | 922 | FileId(0) 68..73 FieldShorthandForField Read |
923 | "#]], | 923 | "#]], |
@@ -941,7 +941,7 @@ fn f(e: En) { | |||
941 | } | 941 | } |
942 | "#, | 942 | "#, |
943 | expect![[r#" | 943 | expect![[r#" |
944 | field RECORD_FIELD FileId(0) 32..41 32..37 Other | 944 | field Field FileId(0) 32..41 32..37 Other |
945 | 945 | ||
946 | FileId(0) 102..107 FieldShorthandForField Read | 946 | FileId(0) 102..107 FieldShorthandForField Read |
947 | "#]], | 947 | "#]], |
@@ -965,7 +965,7 @@ fn f() -> m::En { | |||
965 | } | 965 | } |
966 | "#, | 966 | "#, |
967 | expect![[r#" | 967 | expect![[r#" |
968 | field RECORD_FIELD FileId(0) 56..65 56..61 Other | 968 | field Field FileId(0) 56..65 56..61 Other |
969 | 969 | ||
970 | FileId(0) 125..130 RecordFieldExprOrPat Read | 970 | FileId(0) 125..130 RecordFieldExprOrPat Read |
971 | "#]], | 971 | "#]], |
@@ -990,7 +990,7 @@ impl Foo { | |||
990 | } | 990 | } |
991 | "#, | 991 | "#, |
992 | expect![[r#" | 992 | expect![[r#" |
993 | self SELF_KW FileId(0) 47..51 47..51 SelfKw Read | 993 | self SelfParam FileId(0) 47..51 47..51 SelfKw Read |
994 | 994 | ||
995 | FileId(0) 71..75 SelfKw Read | 995 | FileId(0) 71..75 SelfKw Read |
996 | FileId(0) 152..156 SelfKw Read | 996 | FileId(0) 152..156 SelfKw Read |
@@ -1038,7 +1038,7 @@ fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> { | |||
1038 | } | 1038 | } |
1039 | "#, | 1039 | "#, |
1040 | expect![[r#" | 1040 | expect![[r#" |
1041 | 'a LIFETIME_PARAM FileId(0) 55..57 55..57 Lifetime | 1041 | 'a LifetimeParam FileId(0) 55..57 55..57 Lifetime |
1042 | 1042 | ||
1043 | FileId(0) 63..65 Lifetime | 1043 | FileId(0) 63..65 Lifetime |
1044 | FileId(0) 71..73 Lifetime | 1044 | FileId(0) 71..73 Lifetime |
@@ -1056,7 +1056,7 @@ fn foo<'a, 'b: 'a>(x: &'a<|> ()) -> &'a () where &'a (): Foo<'a> { | |||
1056 | type Foo<'a, T> where T: 'a<|> = &'a T; | 1056 | type Foo<'a, T> where T: 'a<|> = &'a T; |
1057 | "#, | 1057 | "#, |
1058 | expect![[r#" | 1058 | expect![[r#" |
1059 | 'a LIFETIME_PARAM FileId(0) 9..11 9..11 Lifetime | 1059 | 'a LifetimeParam FileId(0) 9..11 9..11 Lifetime |
1060 | 1060 | ||
1061 | FileId(0) 25..27 Lifetime | 1061 | FileId(0) 25..27 Lifetime |
1062 | FileId(0) 31..33 Lifetime | 1062 | FileId(0) 31..33 Lifetime |
@@ -1078,7 +1078,7 @@ impl<'a> Foo<'a> for &'a () { | |||
1078 | } | 1078 | } |
1079 | "#, | 1079 | "#, |
1080 | expect![[r#" | 1080 | expect![[r#" |
1081 | 'a LIFETIME_PARAM FileId(0) 47..49 47..49 Lifetime | 1081 | 'a LifetimeParam FileId(0) 47..49 47..49 Lifetime |
1082 | 1082 | ||
1083 | FileId(0) 55..57 Lifetime | 1083 | FileId(0) 55..57 Lifetime |
1084 | FileId(0) 64..66 Lifetime | 1084 | FileId(0) 64..66 Lifetime |
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs index 56e923841..cd721b7eb 100644 --- a/crates/ide/src/references/rename.rs +++ b/crates/ide/src/references/rename.rs | |||
@@ -1488,4 +1488,39 @@ impl<'yeeee> Foo<'yeeee> for &'yeeee () { | |||
1488 | "#, | 1488 | "#, |
1489 | ) | 1489 | ) |
1490 | } | 1490 | } |
1491 | |||
1492 | #[test] | ||
1493 | fn test_rename_bind_pat() { | ||
1494 | check( | ||
1495 | "new_name", | ||
1496 | r#" | ||
1497 | fn main() { | ||
1498 | enum CustomOption<T> { | ||
1499 | None, | ||
1500 | Some(T), | ||
1501 | } | ||
1502 | |||
1503 | let test_variable = CustomOption::Some(22); | ||
1504 | |||
1505 | match test_variable { | ||
1506 | CustomOption::Some(foo<|>) if foo == 11 => {} | ||
1507 | _ => (), | ||
1508 | } | ||
1509 | }"#, | ||
1510 | r#" | ||
1511 | fn main() { | ||
1512 | enum CustomOption<T> { | ||
1513 | None, | ||
1514 | Some(T), | ||
1515 | } | ||
1516 | |||
1517 | let test_variable = CustomOption::Some(22); | ||
1518 | |||
1519 | match test_variable { | ||
1520 | CustomOption::Some(new_name) if new_name == 11 => {} | ||
1521 | _ => (), | ||
1522 | } | ||
1523 | }"#, | ||
1524 | ); | ||
1525 | } | ||
1491 | } | 1526 | } |
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index 96462a7b0..2f2b99130 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs | |||
@@ -2,7 +2,7 @@ use std::fmt; | |||
2 | 2 | ||
3 | use assists::utils::test_related_attribute; | 3 | use assists::utils::test_related_attribute; |
4 | use cfg::CfgExpr; | 4 | use cfg::CfgExpr; |
5 | use hir::{AsAssocItem, Attrs, HirFileId, InFile, Semantics}; | 5 | use hir::{AsAssocItem, HasAttrs, InFile, Semantics}; |
6 | use ide_db::RootDatabase; | 6 | use ide_db::RootDatabase; |
7 | use itertools::Itertools; | 7 | use itertools::Itertools; |
8 | use syntax::{ | 8 | use syntax::{ |
@@ -10,7 +10,10 @@ use syntax::{ | |||
10 | match_ast, SyntaxNode, | 10 | match_ast, SyntaxNode, |
11 | }; | 11 | }; |
12 | 12 | ||
13 | use crate::{display::ToNav, FileId, NavigationTarget}; | 13 | use crate::{ |
14 | display::{ToNav, TryToNav}, | ||
15 | FileId, NavigationTarget, SymbolKind, | ||
16 | }; | ||
14 | 17 | ||
15 | #[derive(Debug, Clone)] | 18 | #[derive(Debug, Clone)] |
16 | pub struct Runnable { | 19 | pub struct Runnable { |
@@ -101,124 +104,113 @@ pub(crate) fn runnable( | |||
101 | item: SyntaxNode, | 104 | item: SyntaxNode, |
102 | file_id: FileId, | 105 | file_id: FileId, |
103 | ) -> Option<Runnable> { | 106 | ) -> Option<Runnable> { |
104 | match_ast! { | 107 | let runnable_item = match_ast! { |
105 | match item { | 108 | match (item.clone()) { |
106 | ast::Struct(it) => runnable_struct(sema, it, file_id), | ||
107 | ast::Fn(it) => runnable_fn(sema, it, file_id), | 109 | ast::Fn(it) => runnable_fn(sema, it, file_id), |
108 | ast::Module(it) => runnable_mod(sema, it, file_id), | 110 | ast::Module(it) => runnable_mod(sema, it), |
109 | _ => None, | 111 | _ => None, |
110 | } | 112 | } |
111 | } | 113 | }; |
114 | runnable_item.or_else(|| runnable_doctest(sema, item)) | ||
112 | } | 115 | } |
113 | 116 | ||
114 | fn runnable_fn( | 117 | fn runnable_fn(sema: &Semantics<RootDatabase>, func: ast::Fn, file_id: FileId) -> Option<Runnable> { |
115 | sema: &Semantics<RootDatabase>, | 118 | let def = sema.to_def(&func)?; |
116 | fn_def: ast::Fn, | 119 | let name_string = func.name()?.text().to_string(); |
117 | file_id: FileId, | ||
118 | ) -> Option<Runnable> { | ||
119 | let name_string = fn_def.name()?.text().to_string(); | ||
120 | 120 | ||
121 | let attrs = Attrs::from_attrs_owner(sema.db, InFile::new(HirFileId::from(file_id), &fn_def)); | ||
122 | let kind = if name_string == "main" { | 121 | let kind = if name_string == "main" { |
123 | RunnableKind::Bin | 122 | RunnableKind::Bin |
124 | } else { | 123 | } else { |
125 | let test_id = match sema.to_def(&fn_def).map(|def| def.module(sema.db)) { | 124 | let canonical_path = sema.to_def(&func).and_then(|def| { |
126 | Some(module) => { | 125 | let def: hir::ModuleDef = def.into(); |
127 | let def = sema.to_def(&fn_def)?; | 126 | def.canonical_path(sema.db) |
128 | let impl_trait_name = def.as_assoc_item(sema.db).and_then(|assoc_item| { | 127 | }); |
129 | match assoc_item.container(sema.db) { | 128 | let test_id = canonical_path.map(TestId::Path).unwrap_or(TestId::Name(name_string)); |
130 | hir::AssocItemContainer::Trait(trait_item) => { | 129 | |
131 | Some(trait_item.name(sema.db).to_string()) | 130 | if test_related_attribute(&func).is_some() { |
132 | } | 131 | let attr = TestAttr::from_fn(&func); |
133 | hir::AssocItemContainer::Impl(impl_def) => impl_def | ||
134 | .target_ty(sema.db) | ||
135 | .as_adt() | ||
136 | .map(|adt| adt.name(sema.db).to_string()), | ||
137 | } | ||
138 | }); | ||
139 | |||
140 | let path_iter = module | ||
141 | .path_to_root(sema.db) | ||
142 | .into_iter() | ||
143 | .rev() | ||
144 | .filter_map(|it| it.name(sema.db)) | ||
145 | .map(|name| name.to_string()); | ||
146 | |||
147 | let path = if let Some(impl_trait_name) = impl_trait_name { | ||
148 | path_iter | ||
149 | .chain(std::iter::once(impl_trait_name)) | ||
150 | .chain(std::iter::once(name_string)) | ||
151 | .join("::") | ||
152 | } else { | ||
153 | path_iter.chain(std::iter::once(name_string)).join("::") | ||
154 | }; | ||
155 | |||
156 | TestId::Path(path) | ||
157 | } | ||
158 | None => TestId::Name(name_string), | ||
159 | }; | ||
160 | |||
161 | if test_related_attribute(&fn_def).is_some() { | ||
162 | let attr = TestAttr::from_fn(&fn_def); | ||
163 | RunnableKind::Test { test_id, attr } | 132 | RunnableKind::Test { test_id, attr } |
164 | } else if fn_def.has_atom_attr("bench") { | 133 | } else if func.has_atom_attr("bench") { |
165 | RunnableKind::Bench { test_id } | 134 | RunnableKind::Bench { test_id } |
166 | } else if has_runnable_doc_test(&attrs) { | ||
167 | RunnableKind::DocTest { test_id } | ||
168 | } else { | 135 | } else { |
169 | return None; | 136 | return None; |
170 | } | 137 | } |
171 | }; | 138 | }; |
172 | 139 | ||
173 | let cfg = attrs.cfg(); | 140 | let nav = NavigationTarget::from_named( |
174 | 141 | sema.db, | |
175 | let nav = if let RunnableKind::DocTest { .. } = kind { | 142 | InFile::new(file_id.into(), &func), |
176 | NavigationTarget::from_doc_commented( | 143 | SymbolKind::Function, |
177 | sema.db, | 144 | ); |
178 | InFile::new(file_id.into(), &fn_def), | 145 | let cfg = def.attrs(sema.db).cfg(); |
179 | InFile::new(file_id.into(), &fn_def), | ||
180 | ) | ||
181 | } else { | ||
182 | NavigationTarget::from_named(sema.db, InFile::new(file_id.into(), &fn_def)) | ||
183 | }; | ||
184 | Some(Runnable { nav, kind, cfg }) | 146 | Some(Runnable { nav, kind, cfg }) |
185 | } | 147 | } |
186 | 148 | ||
187 | fn runnable_struct( | 149 | fn runnable_doctest(sema: &Semantics<RootDatabase>, item: SyntaxNode) -> Option<Runnable> { |
188 | sema: &Semantics<RootDatabase>, | 150 | match_ast! { |
189 | struct_def: ast::Struct, | 151 | match item { |
190 | file_id: FileId, | 152 | ast::Fn(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), |
191 | ) -> Option<Runnable> { | 153 | ast::Struct(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), |
192 | let name_string = struct_def.name()?.text().to_string(); | 154 | ast::Enum(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), |
155 | ast::Union(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), | ||
156 | ast::Trait(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), | ||
157 | ast::Const(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), | ||
158 | ast::Static(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), | ||
159 | ast::TypeAlias(it) => module_def_doctest(sema, sema.to_def(&it)?.into()), | ||
160 | _ => None, | ||
161 | } | ||
162 | } | ||
163 | } | ||
193 | 164 | ||
194 | let attrs = | 165 | fn module_def_doctest(sema: &Semantics<RootDatabase>, def: hir::ModuleDef) -> Option<Runnable> { |
195 | Attrs::from_attrs_owner(sema.db, InFile::new(HirFileId::from(file_id), &struct_def)); | 166 | let attrs = match def { |
167 | hir::ModuleDef::Module(it) => it.attrs(sema.db), | ||
168 | hir::ModuleDef::Function(it) => it.attrs(sema.db), | ||
169 | hir::ModuleDef::Adt(it) => it.attrs(sema.db), | ||
170 | hir::ModuleDef::Variant(it) => it.attrs(sema.db), | ||
171 | hir::ModuleDef::Const(it) => it.attrs(sema.db), | ||
172 | hir::ModuleDef::Static(it) => it.attrs(sema.db), | ||
173 | hir::ModuleDef::Trait(it) => it.attrs(sema.db), | ||
174 | hir::ModuleDef::TypeAlias(it) => it.attrs(sema.db), | ||
175 | hir::ModuleDef::BuiltinType(_) => return None, | ||
176 | }; | ||
196 | if !has_runnable_doc_test(&attrs) { | 177 | if !has_runnable_doc_test(&attrs) { |
197 | return None; | 178 | return None; |
198 | } | 179 | } |
199 | let cfg = attrs.cfg(); | 180 | let def_name = def.name(sema.db).map(|it| it.to_string()); |
200 | 181 | let test_id = def | |
201 | let test_id = match sema.to_def(&struct_def).map(|def| def.module(sema.db)) { | 182 | .canonical_path(sema.db) |
202 | Some(module) => { | 183 | // This probably belongs to canonical path? |
203 | let path_iter = module | 184 | .map(|path| { |
204 | .path_to_root(sema.db) | 185 | let assoc_def = match def { |
205 | .into_iter() | 186 | hir::ModuleDef::Function(it) => it.as_assoc_item(sema.db), |
206 | .rev() | 187 | hir::ModuleDef::Const(it) => it.as_assoc_item(sema.db), |
207 | .filter_map(|it| it.name(sema.db)) | 188 | hir::ModuleDef::TypeAlias(it) => it.as_assoc_item(sema.db), |
208 | .map(|name| name.to_string()); | 189 | _ => None, |
209 | let path = path_iter.chain(std::iter::once(name_string)).join("::"); | 190 | }; |
210 | 191 | // FIXME: this also looks very wrong | |
211 | TestId::Path(path) | 192 | if let Some(assoc_def) = assoc_def { |
212 | } | 193 | if let hir::AssocItemContainer::Impl(imp) = assoc_def.container(sema.db) { |
213 | None => TestId::Name(name_string), | 194 | if let Some(adt) = imp.target_ty(sema.db).as_adt() { |
214 | }; | 195 | let name = adt.name(sema.db).to_string(); |
215 | 196 | let idx = path.rfind(':').unwrap_or(0); | |
216 | let nav = NavigationTarget::from_doc_commented( | 197 | let (prefix, suffix) = path.split_at(idx); |
217 | sema.db, | 198 | return format!("{}{}::{}", prefix, name, suffix); |
218 | InFile::new(file_id.into(), &struct_def), | 199 | } |
219 | InFile::new(file_id.into(), &struct_def), | 200 | } |
220 | ); | 201 | } |
221 | Some(Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg }) | 202 | path |
203 | }) | ||
204 | .map(TestId::Path) | ||
205 | .or_else(|| def_name.clone().map(TestId::Name))?; | ||
206 | |||
207 | let mut nav = def.try_to_nav(sema.db)?; | ||
208 | nav.focus_range = None; | ||
209 | nav.description = None; | ||
210 | nav.docs = None; | ||
211 | nav.kind = None; | ||
212 | let res = Runnable { nav, kind: RunnableKind::DocTest { test_id }, cfg: attrs.cfg() }; | ||
213 | Some(res) | ||
222 | } | 214 | } |
223 | 215 | ||
224 | #[derive(Debug, Copy, Clone)] | 216 | #[derive(Debug, Copy, Clone)] |
@@ -262,11 +254,7 @@ fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool { | |||
262 | }) | 254 | }) |
263 | } | 255 | } |
264 | 256 | ||
265 | fn runnable_mod( | 257 | fn runnable_mod(sema: &Semantics<RootDatabase>, module: ast::Module) -> Option<Runnable> { |
266 | sema: &Semantics<RootDatabase>, | ||
267 | module: ast::Module, | ||
268 | file_id: FileId, | ||
269 | ) -> Option<Runnable> { | ||
270 | if !has_test_function_or_multiple_test_submodules(&module) { | 258 | if !has_test_function_or_multiple_test_submodules(&module) { |
271 | return None; | 259 | return None; |
272 | } | 260 | } |
@@ -279,7 +267,8 @@ fn runnable_mod( | |||
279 | .filter_map(|it| it.name(sema.db)) | 267 | .filter_map(|it| it.name(sema.db)) |
280 | .join("::"); | 268 | .join("::"); |
281 | 269 | ||
282 | let attrs = Attrs::from_attrs_owner(sema.db, InFile::new(HirFileId::from(file_id), &module)); | 270 | let def = sema.to_def(&module)?; |
271 | let attrs = def.attrs(sema.db); | ||
283 | let cfg = attrs.cfg(); | 272 | let cfg = attrs.cfg(); |
284 | let nav = module_def.to_nav(sema.db); | 273 | let nav = module_def.to_nav(sema.db); |
285 | Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg }) | 274 | Some(Runnable { nav, kind: RunnableKind::TestMod { path }, cfg }) |
@@ -319,7 +308,7 @@ mod tests { | |||
319 | 308 | ||
320 | use crate::fixture; | 309 | use crate::fixture; |
321 | 310 | ||
322 | use super::{RunnableAction, BENCH, BIN, DOCTEST, TEST}; | 311 | use super::*; |
323 | 312 | ||
324 | fn check( | 313 | fn check( |
325 | ra_fixture: &str, | 314 | ra_fixture: &str, |
@@ -363,14 +352,9 @@ fn bench() {} | |||
363 | 0, | 352 | 0, |
364 | ), | 353 | ), |
365 | full_range: 1..13, | 354 | full_range: 1..13, |
366 | focus_range: Some( | 355 | focus_range: 4..8, |
367 | 4..8, | ||
368 | ), | ||
369 | name: "main", | 356 | name: "main", |
370 | kind: FN, | 357 | kind: Function, |
371 | container_name: None, | ||
372 | description: None, | ||
373 | docs: None, | ||
374 | }, | 358 | }, |
375 | kind: Bin, | 359 | kind: Bin, |
376 | cfg: None, | 360 | cfg: None, |
@@ -381,14 +365,9 @@ fn bench() {} | |||
381 | 0, | 365 | 0, |
382 | ), | 366 | ), |
383 | full_range: 15..39, | 367 | full_range: 15..39, |
384 | focus_range: Some( | 368 | focus_range: 26..34, |
385 | 26..34, | ||
386 | ), | ||
387 | name: "test_foo", | 369 | name: "test_foo", |
388 | kind: FN, | 370 | kind: Function, |
389 | container_name: None, | ||
390 | description: None, | ||
391 | docs: None, | ||
392 | }, | 371 | }, |
393 | kind: Test { | 372 | kind: Test { |
394 | test_id: Path( | 373 | test_id: Path( |
@@ -406,14 +385,9 @@ fn bench() {} | |||
406 | 0, | 385 | 0, |
407 | ), | 386 | ), |
408 | full_range: 41..75, | 387 | full_range: 41..75, |
409 | focus_range: Some( | 388 | focus_range: 62..70, |
410 | 62..70, | ||
411 | ), | ||
412 | name: "test_foo", | 389 | name: "test_foo", |
413 | kind: FN, | 390 | kind: Function, |
414 | container_name: None, | ||
415 | description: None, | ||
416 | docs: None, | ||
417 | }, | 391 | }, |
418 | kind: Test { | 392 | kind: Test { |
419 | test_id: Path( | 393 | test_id: Path( |
@@ -431,14 +405,9 @@ fn bench() {} | |||
431 | 0, | 405 | 0, |
432 | ), | 406 | ), |
433 | full_range: 77..99, | 407 | full_range: 77..99, |
434 | focus_range: Some( | 408 | focus_range: 89..94, |
435 | 89..94, | ||
436 | ), | ||
437 | name: "bench", | 409 | name: "bench", |
438 | kind: FN, | 410 | kind: Function, |
439 | container_name: None, | ||
440 | description: None, | ||
441 | docs: None, | ||
442 | }, | 411 | }, |
443 | kind: Bench { | 412 | kind: Bench { |
444 | test_id: Path( | 413 | test_id: Path( |
@@ -528,14 +497,9 @@ struct StructWithRunnable(String); | |||
528 | 0, | 497 | 0, |
529 | ), | 498 | ), |
530 | full_range: 1..13, | 499 | full_range: 1..13, |
531 | focus_range: Some( | 500 | focus_range: 4..8, |
532 | 4..8, | ||
533 | ), | ||
534 | name: "main", | 501 | name: "main", |
535 | kind: FN, | 502 | kind: Function, |
536 | container_name: None, | ||
537 | description: None, | ||
538 | docs: None, | ||
539 | }, | 503 | }, |
540 | kind: Bin, | 504 | kind: Bin, |
541 | cfg: None, | 505 | cfg: None, |
@@ -546,12 +510,7 @@ struct StructWithRunnable(String); | |||
546 | 0, | 510 | 0, |
547 | ), | 511 | ), |
548 | full_range: 15..74, | 512 | full_range: 15..74, |
549 | focus_range: None, | ||
550 | name: "should_have_runnable", | 513 | name: "should_have_runnable", |
551 | kind: FN, | ||
552 | container_name: None, | ||
553 | description: None, | ||
554 | docs: None, | ||
555 | }, | 514 | }, |
556 | kind: DocTest { | 515 | kind: DocTest { |
557 | test_id: Path( | 516 | test_id: Path( |
@@ -566,12 +525,7 @@ struct StructWithRunnable(String); | |||
566 | 0, | 525 | 0, |
567 | ), | 526 | ), |
568 | full_range: 76..148, | 527 | full_range: 76..148, |
569 | focus_range: None, | ||
570 | name: "should_have_runnable_1", | 528 | name: "should_have_runnable_1", |
571 | kind: FN, | ||
572 | container_name: None, | ||
573 | description: None, | ||
574 | docs: None, | ||
575 | }, | 529 | }, |
576 | kind: DocTest { | 530 | kind: DocTest { |
577 | test_id: Path( | 531 | test_id: Path( |
@@ -586,12 +540,7 @@ struct StructWithRunnable(String); | |||
586 | 0, | 540 | 0, |
587 | ), | 541 | ), |
588 | full_range: 150..254, | 542 | full_range: 150..254, |
589 | focus_range: None, | ||
590 | name: "should_have_runnable_2", | 543 | name: "should_have_runnable_2", |
591 | kind: FN, | ||
592 | container_name: None, | ||
593 | description: None, | ||
594 | docs: None, | ||
595 | }, | 544 | }, |
596 | kind: DocTest { | 545 | kind: DocTest { |
597 | test_id: Path( | 546 | test_id: Path( |
@@ -606,12 +555,7 @@ struct StructWithRunnable(String); | |||
606 | 0, | 555 | 0, |
607 | ), | 556 | ), |
608 | full_range: 756..821, | 557 | full_range: 756..821, |
609 | focus_range: None, | ||
610 | name: "StructWithRunnable", | 558 | name: "StructWithRunnable", |
611 | kind: STRUCT, | ||
612 | container_name: None, | ||
613 | description: None, | ||
614 | docs: None, | ||
615 | }, | 559 | }, |
616 | kind: DocTest { | 560 | kind: DocTest { |
617 | test_id: Path( | 561 | test_id: Path( |
@@ -650,14 +594,9 @@ impl Data { | |||
650 | 0, | 594 | 0, |
651 | ), | 595 | ), |
652 | full_range: 1..13, | 596 | full_range: 1..13, |
653 | focus_range: Some( | 597 | focus_range: 4..8, |
654 | 4..8, | ||
655 | ), | ||
656 | name: "main", | 598 | name: "main", |
657 | kind: FN, | 599 | kind: Function, |
658 | container_name: None, | ||
659 | description: None, | ||
660 | docs: None, | ||
661 | }, | 600 | }, |
662 | kind: Bin, | 601 | kind: Bin, |
663 | cfg: None, | 602 | cfg: None, |
@@ -668,12 +607,7 @@ impl Data { | |||
668 | 0, | 607 | 0, |
669 | ), | 608 | ), |
670 | full_range: 44..98, | 609 | full_range: 44..98, |
671 | focus_range: None, | ||
672 | name: "foo", | 610 | name: "foo", |
673 | kind: FN, | ||
674 | container_name: None, | ||
675 | description: None, | ||
676 | docs: None, | ||
677 | }, | 611 | }, |
678 | kind: DocTest { | 612 | kind: DocTest { |
679 | test_id: Path( | 613 | test_id: Path( |
@@ -707,14 +641,9 @@ mod test_mod { | |||
707 | 0, | 641 | 0, |
708 | ), | 642 | ), |
709 | full_range: 1..51, | 643 | full_range: 1..51, |
710 | focus_range: Some( | 644 | focus_range: 5..13, |
711 | 5..13, | ||
712 | ), | ||
713 | name: "test_mod", | 645 | name: "test_mod", |
714 | kind: MODULE, | 646 | kind: Module, |
715 | container_name: None, | ||
716 | description: None, | ||
717 | docs: None, | ||
718 | }, | 647 | }, |
719 | kind: TestMod { | 648 | kind: TestMod { |
720 | path: "test_mod", | 649 | path: "test_mod", |
@@ -727,14 +656,9 @@ mod test_mod { | |||
727 | 0, | 656 | 0, |
728 | ), | 657 | ), |
729 | full_range: 20..49, | 658 | full_range: 20..49, |
730 | focus_range: Some( | 659 | focus_range: 35..44, |
731 | 35..44, | ||
732 | ), | ||
733 | name: "test_foo1", | 660 | name: "test_foo1", |
734 | kind: FN, | 661 | kind: Function, |
735 | container_name: None, | ||
736 | description: None, | ||
737 | docs: None, | ||
738 | }, | 662 | }, |
739 | kind: Test { | 663 | kind: Test { |
740 | test_id: Path( | 664 | test_id: Path( |
@@ -787,14 +711,9 @@ mod root_tests { | |||
787 | 0, | 711 | 0, |
788 | ), | 712 | ), |
789 | full_range: 22..323, | 713 | full_range: 22..323, |
790 | focus_range: Some( | 714 | focus_range: 26..40, |
791 | 26..40, | ||
792 | ), | ||
793 | name: "nested_tests_0", | 715 | name: "nested_tests_0", |
794 | kind: MODULE, | 716 | kind: Module, |
795 | container_name: None, | ||
796 | description: None, | ||
797 | docs: None, | ||
798 | }, | 717 | }, |
799 | kind: TestMod { | 718 | kind: TestMod { |
800 | path: "root_tests::nested_tests_0", | 719 | path: "root_tests::nested_tests_0", |
@@ -807,14 +726,9 @@ mod root_tests { | |||
807 | 0, | 726 | 0, |
808 | ), | 727 | ), |
809 | full_range: 51..192, | 728 | full_range: 51..192, |
810 | focus_range: Some( | 729 | focus_range: 55..69, |
811 | 55..69, | ||
812 | ), | ||
813 | name: "nested_tests_1", | 730 | name: "nested_tests_1", |
814 | kind: MODULE, | 731 | kind: Module, |
815 | container_name: None, | ||
816 | description: None, | ||
817 | docs: None, | ||
818 | }, | 732 | }, |
819 | kind: TestMod { | 733 | kind: TestMod { |
820 | path: "root_tests::nested_tests_0::nested_tests_1", | 734 | path: "root_tests::nested_tests_0::nested_tests_1", |
@@ -827,14 +741,9 @@ mod root_tests { | |||
827 | 0, | 741 | 0, |
828 | ), | 742 | ), |
829 | full_range: 84..126, | 743 | full_range: 84..126, |
830 | focus_range: Some( | 744 | focus_range: 107..121, |
831 | 107..121, | ||
832 | ), | ||
833 | name: "nested_test_11", | 745 | name: "nested_test_11", |
834 | kind: FN, | 746 | kind: Function, |
835 | container_name: None, | ||
836 | description: None, | ||
837 | docs: None, | ||
838 | }, | 747 | }, |
839 | kind: Test { | 748 | kind: Test { |
840 | test_id: Path( | 749 | test_id: Path( |
@@ -852,14 +761,9 @@ mod root_tests { | |||
852 | 0, | 761 | 0, |
853 | ), | 762 | ), |
854 | full_range: 140..182, | 763 | full_range: 140..182, |
855 | focus_range: Some( | 764 | focus_range: 163..177, |
856 | 163..177, | ||
857 | ), | ||
858 | name: "nested_test_12", | 765 | name: "nested_test_12", |
859 | kind: FN, | 766 | kind: Function, |
860 | container_name: None, | ||
861 | description: None, | ||
862 | docs: None, | ||
863 | }, | 767 | }, |
864 | kind: Test { | 768 | kind: Test { |
865 | test_id: Path( | 769 | test_id: Path( |
@@ -877,14 +781,9 @@ mod root_tests { | |||
877 | 0, | 781 | 0, |
878 | ), | 782 | ), |
879 | full_range: 202..286, | 783 | full_range: 202..286, |
880 | focus_range: Some( | 784 | focus_range: 206..220, |
881 | 206..220, | ||
882 | ), | ||
883 | name: "nested_tests_2", | 785 | name: "nested_tests_2", |
884 | kind: MODULE, | 786 | kind: Module, |
885 | container_name: None, | ||
886 | description: None, | ||
887 | docs: None, | ||
888 | }, | 787 | }, |
889 | kind: TestMod { | 788 | kind: TestMod { |
890 | path: "root_tests::nested_tests_0::nested_tests_2", | 789 | path: "root_tests::nested_tests_0::nested_tests_2", |
@@ -897,14 +796,9 @@ mod root_tests { | |||
897 | 0, | 796 | 0, |
898 | ), | 797 | ), |
899 | full_range: 235..276, | 798 | full_range: 235..276, |
900 | focus_range: Some( | 799 | focus_range: 258..271, |
901 | 258..271, | ||
902 | ), | ||
903 | name: "nested_test_2", | 800 | name: "nested_test_2", |
904 | kind: FN, | 801 | kind: Function, |
905 | container_name: None, | ||
906 | description: None, | ||
907 | docs: None, | ||
908 | }, | 802 | }, |
909 | kind: Test { | 803 | kind: Test { |
910 | test_id: Path( | 804 | test_id: Path( |
@@ -940,14 +834,9 @@ fn test_foo1() {} | |||
940 | 0, | 834 | 0, |
941 | ), | 835 | ), |
942 | full_range: 1..50, | 836 | full_range: 1..50, |
943 | focus_range: Some( | 837 | focus_range: 36..45, |
944 | 36..45, | ||
945 | ), | ||
946 | name: "test_foo1", | 838 | name: "test_foo1", |
947 | kind: FN, | 839 | kind: Function, |
948 | container_name: None, | ||
949 | description: None, | ||
950 | docs: None, | ||
951 | }, | 840 | }, |
952 | kind: Test { | 841 | kind: Test { |
953 | test_id: Path( | 842 | test_id: Path( |
@@ -990,14 +879,9 @@ fn test_foo1() {} | |||
990 | 0, | 879 | 0, |
991 | ), | 880 | ), |
992 | full_range: 1..72, | 881 | full_range: 1..72, |
993 | focus_range: Some( | 882 | focus_range: 58..67, |
994 | 58..67, | ||
995 | ), | ||
996 | name: "test_foo1", | 883 | name: "test_foo1", |
997 | kind: FN, | 884 | kind: Function, |
998 | container_name: None, | ||
999 | description: None, | ||
1000 | docs: None, | ||
1001 | }, | 885 | }, |
1002 | kind: Test { | 886 | kind: Test { |
1003 | test_id: Path( | 887 | test_id: Path( |
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs index 488969f1a..00c717c7c 100644 --- a/crates/ide/src/syntax_highlighting.rs +++ b/crates/ide/src/syntax_highlighting.rs | |||
@@ -23,7 +23,7 @@ use crate::{ | |||
23 | syntax_highlighting::{ | 23 | syntax_highlighting::{ |
24 | format::FormatStringHighlighter, macro_rules::MacroRulesHighlighter, tags::Highlight, | 24 | format::FormatStringHighlighter, macro_rules::MacroRulesHighlighter, tags::Highlight, |
25 | }, | 25 | }, |
26 | FileId, HighlightModifier, HighlightTag, | 26 | FileId, HighlightModifier, HighlightTag, SymbolKind, |
27 | }; | 27 | }; |
28 | 28 | ||
29 | pub(crate) use html::highlight_as_html; | 29 | pub(crate) use html::highlight_as_html; |
@@ -103,7 +103,7 @@ pub(crate) fn highlight( | |||
103 | if let Some(range) = macro_call_range(&mc) { | 103 | if let Some(range) = macro_call_range(&mc) { |
104 | stack.add(HighlightedRange { | 104 | stack.add(HighlightedRange { |
105 | range, | 105 | range, |
106 | highlight: HighlightTag::Macro.into(), | 106 | highlight: HighlightTag::Symbol(SymbolKind::Macro).into(), |
107 | binding_hash: None, | 107 | binding_hash: None, |
108 | }); | 108 | }); |
109 | } | 109 | } |
@@ -470,13 +470,13 @@ fn highlight_element( | |||
470 | }; | 470 | }; |
471 | 471 | ||
472 | match name_kind { | 472 | match name_kind { |
473 | Some(NameClass::ExternCrate(_)) => HighlightTag::Module.into(), | 473 | Some(NameClass::ExternCrate(_)) => HighlightTag::Symbol(SymbolKind::Module).into(), |
474 | Some(NameClass::Definition(def)) => { | 474 | Some(NameClass::Definition(def)) => { |
475 | highlight_def(db, def) | HighlightModifier::Definition | 475 | highlight_def(db, def) | HighlightModifier::Definition |
476 | } | 476 | } |
477 | Some(NameClass::ConstReference(def)) => highlight_def(db, def), | 477 | Some(NameClass::ConstReference(def)) => highlight_def(db, def), |
478 | Some(NameClass::PatFieldShorthand { field_ref, .. }) => { | 478 | Some(NameClass::PatFieldShorthand { field_ref, .. }) => { |
479 | let mut h = HighlightTag::Field.into(); | 479 | let mut h = HighlightTag::Symbol(SymbolKind::Field).into(); |
480 | if let Definition::Field(field) = field_ref { | 480 | if let Definition::Field(field) = field_ref { |
481 | if let VariantDef::Union(_) = field.parent_def(db) { | 481 | if let VariantDef::Union(_) = field.parent_def(db) { |
482 | h |= HighlightModifier::Unsafe; | 482 | h |= HighlightModifier::Unsafe; |
@@ -493,14 +493,16 @@ fn highlight_element( | |||
493 | NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => { | 493 | NAME_REF if element.ancestors().any(|it| it.kind() == ATTR) => { |
494 | // even though we track whether we are in an attribute or not we still need this special case | 494 | // even though we track whether we are in an attribute or not we still need this special case |
495 | // as otherwise we would emit unresolved references for name refs inside attributes | 495 | // as otherwise we would emit unresolved references for name refs inside attributes |
496 | Highlight::from(HighlightTag::Function) | 496 | Highlight::from(HighlightTag::Symbol(SymbolKind::Function)) |
497 | } | 497 | } |
498 | NAME_REF => { | 498 | NAME_REF => { |
499 | let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap(); | 499 | let name_ref = element.into_node().and_then(ast::NameRef::cast).unwrap(); |
500 | highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| { | 500 | highlight_func_by_name_ref(sema, &name_ref).unwrap_or_else(|| { |
501 | match NameRefClass::classify(sema, &name_ref) { | 501 | match NameRefClass::classify(sema, &name_ref) { |
502 | Some(name_kind) => match name_kind { | 502 | Some(name_kind) => match name_kind { |
503 | NameRefClass::ExternCrate(_) => HighlightTag::Module.into(), | 503 | NameRefClass::ExternCrate(_) => { |
504 | HighlightTag::Symbol(SymbolKind::Module).into() | ||
505 | } | ||
504 | NameRefClass::Definition(def) => { | 506 | NameRefClass::Definition(def) => { |
505 | if let Definition::Local(local) = &def { | 507 | if let Definition::Local(local) = &def { |
506 | if let Some(name) = local.name(db) { | 508 | if let Some(name) = local.name(db) { |
@@ -530,7 +532,9 @@ fn highlight_element( | |||
530 | 532 | ||
531 | h | 533 | h |
532 | } | 534 | } |
533 | NameRefClass::FieldShorthand { .. } => HighlightTag::Field.into(), | 535 | NameRefClass::FieldShorthand { .. } => { |
536 | HighlightTag::Symbol(SymbolKind::Field).into() | ||
537 | } | ||
534 | }, | 538 | }, |
535 | None if syntactic_name_ref_highlighting => { | 539 | None if syntactic_name_ref_highlighting => { |
536 | highlight_name_ref_by_syntax(name_ref, sema) | 540 | highlight_name_ref_by_syntax(name_ref, sema) |
@@ -556,7 +560,7 @@ fn highlight_element( | |||
556 | CHAR => HighlightTag::CharLiteral.into(), | 560 | CHAR => HighlightTag::CharLiteral.into(), |
557 | QUESTION => Highlight::new(HighlightTag::Operator) | HighlightModifier::ControlFlow, | 561 | QUESTION => Highlight::new(HighlightTag::Operator) | HighlightModifier::ControlFlow, |
558 | LIFETIME => { | 562 | LIFETIME => { |
559 | let h = Highlight::new(HighlightTag::Lifetime); | 563 | let h = Highlight::new(HighlightTag::Symbol(SymbolKind::LifetimeParam)); |
560 | match element.parent().map(|it| it.kind()) { | 564 | match element.parent().map(|it| it.kind()) { |
561 | Some(LIFETIME_PARAM) | Some(LABEL) => h | HighlightModifier::Definition, | 565 | Some(LIFETIME_PARAM) | Some(LABEL) => h | HighlightModifier::Definition, |
562 | _ => h, | 566 | _ => h, |
@@ -580,7 +584,7 @@ fn highlight_element( | |||
580 | HighlightTag::Operator.into() | 584 | HighlightTag::Operator.into() |
581 | } | 585 | } |
582 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { | 586 | T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { |
583 | HighlightTag::Macro.into() | 587 | HighlightTag::Symbol(SymbolKind::Macro).into() |
584 | } | 588 | } |
585 | T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => { | 589 | T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => { |
586 | HighlightTag::BuiltinType.into() | 590 | HighlightTag::BuiltinType.into() |
@@ -659,7 +663,7 @@ fn highlight_element( | |||
659 | .and_then(SyntaxNode::parent) | 663 | .and_then(SyntaxNode::parent) |
660 | .and_then(ast::Path::cast) | 664 | .and_then(ast::Path::cast) |
661 | .and_then(|p| sema.resolve_path(&p)); | 665 | .and_then(|p| sema.resolve_path(&p)); |
662 | let mut h = HighlightTag::SelfKeyword.into(); | 666 | let mut h = HighlightTag::Symbol(SymbolKind::SelfParam).into(); |
663 | if self_param_is_mut | 667 | if self_param_is_mut |
664 | || matches!(self_path, | 668 | || matches!(self_path, |
665 | Some(hir::PathResolution::Local(local)) | 669 | Some(hir::PathResolution::Local(local)) |
@@ -732,7 +736,8 @@ fn highlight_method_call( | |||
732 | method_call: &ast::MethodCallExpr, | 736 | method_call: &ast::MethodCallExpr, |
733 | ) -> Option<Highlight> { | 737 | ) -> Option<Highlight> { |
734 | let func = sema.resolve_method_call(&method_call)?; | 738 | let func = sema.resolve_method_call(&method_call)?; |
735 | let mut h = HighlightTag::Method.into(); | 739 | let mut h = HighlightTag::Symbol(SymbolKind::Function).into(); |
740 | h |= HighlightModifier::Associated; | ||
736 | if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) { | 741 | if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) { |
737 | h |= HighlightModifier::Unsafe; | 742 | h |= HighlightModifier::Unsafe; |
738 | } | 743 | } |
@@ -756,35 +761,45 @@ fn highlight_method_call( | |||
756 | 761 | ||
757 | fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight { | 762 | fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight { |
758 | match def { | 763 | match def { |
759 | Definition::Macro(_) => HighlightTag::Macro, | 764 | Definition::Macro(_) => HighlightTag::Symbol(SymbolKind::Macro), |
760 | Definition::Field(_) => HighlightTag::Field, | 765 | Definition::Field(_) => HighlightTag::Symbol(SymbolKind::Field), |
761 | Definition::ModuleDef(def) => match def { | 766 | Definition::ModuleDef(def) => match def { |
762 | hir::ModuleDef::Module(_) => HighlightTag::Module, | 767 | hir::ModuleDef::Module(_) => HighlightTag::Symbol(SymbolKind::Module), |
763 | hir::ModuleDef::Function(func) => { | 768 | hir::ModuleDef::Function(func) => { |
764 | let mut h = if func.as_assoc_item(db).is_some() { | 769 | let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Function)); |
770 | if func.as_assoc_item(db).is_some() { | ||
771 | h |= HighlightModifier::Associated; | ||
765 | if func.self_param(db).is_none() { | 772 | if func.self_param(db).is_none() { |
766 | Highlight::from(HighlightTag::Method) | HighlightModifier::Static | 773 | h |= HighlightModifier::Static |
767 | } else { | ||
768 | HighlightTag::Method.into() | ||
769 | } | 774 | } |
770 | } else { | 775 | } |
771 | HighlightTag::Function.into() | ||
772 | }; | ||
773 | if func.is_unsafe(db) { | 776 | if func.is_unsafe(db) { |
774 | h |= HighlightModifier::Unsafe; | 777 | h |= HighlightModifier::Unsafe; |
775 | } | 778 | } |
776 | return h; | 779 | return h; |
777 | } | 780 | } |
778 | hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct, | 781 | hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Symbol(SymbolKind::Struct), |
779 | hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Enum, | 782 | hir::ModuleDef::Adt(hir::Adt::Enum(_)) => HighlightTag::Symbol(SymbolKind::Enum), |
780 | hir::ModuleDef::Adt(hir::Adt::Union(_)) => HighlightTag::Union, | 783 | hir::ModuleDef::Adt(hir::Adt::Union(_)) => HighlightTag::Symbol(SymbolKind::Union), |
781 | hir::ModuleDef::EnumVariant(_) => HighlightTag::EnumVariant, | 784 | hir::ModuleDef::Variant(_) => HighlightTag::Symbol(SymbolKind::Variant), |
782 | hir::ModuleDef::Const(_) => HighlightTag::Constant, | 785 | hir::ModuleDef::Const(konst) => { |
783 | hir::ModuleDef::Trait(_) => HighlightTag::Trait, | 786 | let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Const)); |
784 | hir::ModuleDef::TypeAlias(_) => HighlightTag::TypeAlias, | 787 | if konst.as_assoc_item(db).is_some() { |
788 | h |= HighlightModifier::Associated | ||
789 | } | ||
790 | return h; | ||
791 | } | ||
792 | hir::ModuleDef::Trait(_) => HighlightTag::Symbol(SymbolKind::Trait), | ||
793 | hir::ModuleDef::TypeAlias(type_) => { | ||
794 | let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::TypeAlias)); | ||
795 | if type_.as_assoc_item(db).is_some() { | ||
796 | h |= HighlightModifier::Associated | ||
797 | } | ||
798 | return h; | ||
799 | } | ||
785 | hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType, | 800 | hir::ModuleDef::BuiltinType(_) => HighlightTag::BuiltinType, |
786 | hir::ModuleDef::Static(s) => { | 801 | hir::ModuleDef::Static(s) => { |
787 | let mut h = Highlight::new(HighlightTag::Static); | 802 | let mut h = Highlight::new(HighlightTag::Symbol(SymbolKind::Static)); |
788 | if s.is_mut(db) { | 803 | if s.is_mut(db) { |
789 | h |= HighlightModifier::Mutable; | 804 | h |= HighlightModifier::Mutable; |
790 | h |= HighlightModifier::Unsafe; | 805 | h |= HighlightModifier::Unsafe; |
@@ -792,11 +807,14 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight { | |||
792 | return h; | 807 | return h; |
793 | } | 808 | } |
794 | }, | 809 | }, |
795 | Definition::SelfType(_) => HighlightTag::SelfType, | 810 | Definition::SelfType(_) => HighlightTag::Symbol(SymbolKind::Impl), |
796 | Definition::TypeParam(_) => HighlightTag::TypeParam, | 811 | Definition::TypeParam(_) => HighlightTag::Symbol(SymbolKind::TypeParam), |
797 | Definition::Local(local) => { | 812 | Definition::Local(local) => { |
798 | let tag = | 813 | let tag = if local.is_param(db) { |
799 | if local.is_param(db) { HighlightTag::ValueParam } else { HighlightTag::Local }; | 814 | HighlightTag::Symbol(SymbolKind::ValueParam) |
815 | } else { | ||
816 | HighlightTag::Symbol(SymbolKind::Local) | ||
817 | }; | ||
800 | let mut h = Highlight::new(tag); | 818 | let mut h = Highlight::new(tag); |
801 | if local.is_mut(db) || local.ty(db).is_mutable_reference() { | 819 | if local.is_mut(db) || local.ty(db).is_mutable_reference() { |
802 | h |= HighlightModifier::Mutable; | 820 | h |= HighlightModifier::Mutable; |
@@ -806,7 +824,7 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight { | |||
806 | } | 824 | } |
807 | return h; | 825 | return h; |
808 | } | 826 | } |
809 | Definition::LifetimeParam(_) => HighlightTag::Lifetime, | 827 | Definition::LifetimeParam(_) => HighlightTag::Symbol(SymbolKind::LifetimeParam), |
810 | } | 828 | } |
811 | .into() | 829 | .into() |
812 | } | 830 | } |
@@ -820,19 +838,19 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight { | |||
820 | }; | 838 | }; |
821 | 839 | ||
822 | let tag = match parent.kind() { | 840 | let tag = match parent.kind() { |
823 | STRUCT => HighlightTag::Struct, | 841 | STRUCT => HighlightTag::Symbol(SymbolKind::Struct), |
824 | ENUM => HighlightTag::Enum, | 842 | ENUM => HighlightTag::Symbol(SymbolKind::Enum), |
825 | UNION => HighlightTag::Union, | 843 | VARIANT => HighlightTag::Symbol(SymbolKind::Variant), |
826 | TRAIT => HighlightTag::Trait, | 844 | UNION => HighlightTag::Symbol(SymbolKind::Union), |
827 | TYPE_ALIAS => HighlightTag::TypeAlias, | 845 | TRAIT => HighlightTag::Symbol(SymbolKind::Trait), |
828 | TYPE_PARAM => HighlightTag::TypeParam, | 846 | TYPE_ALIAS => HighlightTag::Symbol(SymbolKind::TypeAlias), |
829 | RECORD_FIELD => HighlightTag::Field, | 847 | TYPE_PARAM => HighlightTag::Symbol(SymbolKind::TypeParam), |
830 | MODULE => HighlightTag::Module, | 848 | RECORD_FIELD => HighlightTag::Symbol(SymbolKind::Field), |
831 | FN => HighlightTag::Function, | 849 | MODULE => HighlightTag::Symbol(SymbolKind::Module), |
832 | CONST => HighlightTag::Constant, | 850 | FN => HighlightTag::Symbol(SymbolKind::Function), |
833 | STATIC => HighlightTag::Static, | 851 | CONST => HighlightTag::Symbol(SymbolKind::Const), |
834 | VARIANT => HighlightTag::EnumVariant, | 852 | STATIC => HighlightTag::Symbol(SymbolKind::Static), |
835 | IDENT_PAT => HighlightTag::Local, | 853 | IDENT_PAT => HighlightTag::Symbol(SymbolKind::Local), |
836 | _ => default, | 854 | _ => default, |
837 | }; | 855 | }; |
838 | 856 | ||
@@ -851,10 +869,10 @@ fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabas | |||
851 | METHOD_CALL_EXPR => { | 869 | METHOD_CALL_EXPR => { |
852 | return ast::MethodCallExpr::cast(parent) | 870 | return ast::MethodCallExpr::cast(parent) |
853 | .and_then(|method_call| highlight_method_call(sema, &method_call)) | 871 | .and_then(|method_call| highlight_method_call(sema, &method_call)) |
854 | .unwrap_or_else(|| HighlightTag::Function.into()); | 872 | .unwrap_or_else(|| HighlightTag::Symbol(SymbolKind::Function).into()); |
855 | } | 873 | } |
856 | FIELD_EXPR => { | 874 | FIELD_EXPR => { |
857 | let h = HighlightTag::Field; | 875 | let h = HighlightTag::Symbol(SymbolKind::Field); |
858 | let is_union = ast::FieldExpr::cast(parent) | 876 | let is_union = ast::FieldExpr::cast(parent) |
859 | .and_then(|field_expr| { | 877 | .and_then(|field_expr| { |
860 | let field = sema.resolve_field(&field_expr)?; | 878 | let field = sema.resolve_field(&field_expr)?; |
@@ -881,9 +899,9 @@ fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabas | |||
881 | _ => { | 899 | _ => { |
882 | // within path, decide whether it is module or adt by checking for uppercase name | 900 | // within path, decide whether it is module or adt by checking for uppercase name |
883 | return if name.text().chars().next().unwrap_or_default().is_uppercase() { | 901 | return if name.text().chars().next().unwrap_or_default().is_uppercase() { |
884 | HighlightTag::Struct | 902 | HighlightTag::Symbol(SymbolKind::Struct) |
885 | } else { | 903 | } else { |
886 | HighlightTag::Module | 904 | HighlightTag::Symbol(SymbolKind::Module) |
887 | } | 905 | } |
888 | .into(); | 906 | .into(); |
889 | } | 907 | } |
@@ -894,11 +912,11 @@ fn highlight_name_ref_by_syntax(name: ast::NameRef, sema: &Semantics<RootDatabas | |||
894 | }; | 912 | }; |
895 | 913 | ||
896 | match parent.kind() { | 914 | match parent.kind() { |
897 | CALL_EXPR => HighlightTag::Function.into(), | 915 | CALL_EXPR => HighlightTag::Symbol(SymbolKind::Function).into(), |
898 | _ => if name.text().chars().next().unwrap_or_default().is_uppercase() { | 916 | _ => if name.text().chars().next().unwrap_or_default().is_uppercase() { |
899 | HighlightTag::Struct.into() | 917 | HighlightTag::Symbol(SymbolKind::Struct) |
900 | } else { | 918 | } else { |
901 | HighlightTag::Constant | 919 | HighlightTag::Symbol(SymbolKind::Const) |
902 | } | 920 | } |
903 | .into(), | 921 | .into(), |
904 | } | 922 | } |
diff --git a/crates/ide/src/syntax_highlighting/format.rs b/crates/ide/src/syntax_highlighting/format.rs index 42f27df5d..26416022b 100644 --- a/crates/ide/src/syntax_highlighting/format.rs +++ b/crates/ide/src/syntax_highlighting/format.rs | |||
@@ -4,7 +4,9 @@ use syntax::{ | |||
4 | AstNode, AstToken, SyntaxElement, SyntaxKind, SyntaxNode, TextRange, | 4 | AstNode, AstToken, SyntaxElement, SyntaxKind, SyntaxNode, TextRange, |
5 | }; | 5 | }; |
6 | 6 | ||
7 | use crate::{syntax_highlighting::HighlightedRangeStack, HighlightTag, HighlightedRange}; | 7 | use crate::{ |
8 | syntax_highlighting::HighlightedRangeStack, HighlightTag, HighlightedRange, SymbolKind, | ||
9 | }; | ||
8 | 10 | ||
9 | #[derive(Default)] | 11 | #[derive(Default)] |
10 | pub(super) struct FormatStringHighlighter { | 12 | pub(super) struct FormatStringHighlighter { |
@@ -71,6 +73,6 @@ fn highlight_format_specifier(kind: FormatSpecifier) -> Option<HighlightTag> { | |||
71 | | FormatSpecifier::Asterisk | 73 | | FormatSpecifier::Asterisk |
72 | | FormatSpecifier::QuestionMark => HighlightTag::FormatSpecifier, | 74 | | FormatSpecifier::QuestionMark => HighlightTag::FormatSpecifier, |
73 | FormatSpecifier::Integer | FormatSpecifier::Zero => HighlightTag::NumericLiteral, | 75 | FormatSpecifier::Integer | FormatSpecifier::Zero => HighlightTag::NumericLiteral, |
74 | FormatSpecifier::Identifier => HighlightTag::Local, | 76 | FormatSpecifier::Identifier => HighlightTag::Symbol(SymbolKind::Local), |
75 | }) | 77 | }) |
76 | } | 78 | } |
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs index e97d1be1a..9eb184c74 100644 --- a/crates/ide/src/syntax_highlighting/injection.rs +++ b/crates/ide/src/syntax_highlighting/injection.rs | |||
@@ -179,6 +179,5 @@ pub(super) fn highlight_doc_comment( | |||
179 | stack.add(comment); | 179 | stack.add(comment); |
180 | } | 180 | } |
181 | stack.pop_and_inject(None); | 181 | stack.pop_and_inject(None); |
182 | stack | 182 | stack.pop_and_inject(Some(Highlight::from(HighlightTag::Dummy) | HighlightModifier::Injected)); |
183 | .pop_and_inject(Some(Highlight::from(HighlightTag::Generic) | HighlightModifier::Injected)); | ||
184 | } | 183 | } |
diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index ffd9588b8..974f54fa0 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | use std::{fmt, ops}; | 4 | use std::{fmt, ops}; |
5 | 5 | ||
6 | use crate::SymbolKind; | ||
7 | |||
6 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] | 8 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] |
7 | pub struct Highlight { | 9 | pub struct Highlight { |
8 | pub tag: HighlightTag, | 10 | pub tag: HighlightTag, |
@@ -14,40 +16,25 @@ pub struct HighlightModifiers(u32); | |||
14 | 16 | ||
15 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] | 17 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] |
16 | pub enum HighlightTag { | 18 | pub enum HighlightTag { |
17 | Attribute, | 19 | Symbol(SymbolKind), |
20 | |||
18 | BoolLiteral, | 21 | BoolLiteral, |
19 | BuiltinType, | 22 | BuiltinType, |
20 | ByteLiteral, | 23 | ByteLiteral, |
21 | CharLiteral, | 24 | CharLiteral, |
25 | NumericLiteral, | ||
26 | StringLiteral, | ||
27 | Attribute, | ||
22 | Comment, | 28 | Comment, |
23 | Constant, | ||
24 | Enum, | ||
25 | EnumVariant, | ||
26 | EscapeSequence, | 29 | EscapeSequence, |
27 | Field, | 30 | FormatSpecifier, |
28 | Function, | ||
29 | Generic, | ||
30 | Keyword, | 31 | Keyword, |
31 | Lifetime, | ||
32 | Macro, | ||
33 | Method, | ||
34 | Module, | ||
35 | NumericLiteral, | ||
36 | Punctuation, | 32 | Punctuation, |
37 | SelfKeyword, | ||
38 | SelfType, | ||
39 | Static, | ||
40 | StringLiteral, | ||
41 | Struct, | ||
42 | Trait, | ||
43 | TypeAlias, | ||
44 | TypeParam, | ||
45 | Union, | ||
46 | ValueParam, | ||
47 | Local, | ||
48 | UnresolvedReference, | ||
49 | FormatSpecifier, | ||
50 | Operator, | 33 | Operator, |
34 | UnresolvedReference, | ||
35 | |||
36 | // For things which don't have proper Tag, but want to use modifiers. | ||
37 | Dummy, | ||
51 | } | 38 | } |
52 | 39 | ||
53 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] | 40 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] |
@@ -64,48 +51,53 @@ pub enum HighlightModifier { | |||
64 | Injected, | 51 | Injected, |
65 | Mutable, | 52 | Mutable, |
66 | Consuming, | 53 | Consuming, |
67 | Unsafe, | ||
68 | Callable, | 54 | Callable, |
69 | /// Used for associated functions | 55 | /// Used for associated functions |
70 | Static, | 56 | Static, |
57 | /// Used for items in impls&traits. | ||
58 | Associated, | ||
59 | |||
60 | /// Keep this last! | ||
61 | Unsafe, | ||
71 | } | 62 | } |
72 | 63 | ||
73 | impl HighlightTag { | 64 | impl HighlightTag { |
74 | fn as_str(self) -> &'static str { | 65 | fn as_str(self) -> &'static str { |
75 | match self { | 66 | match self { |
67 | HighlightTag::Symbol(symbol) => match symbol { | ||
68 | SymbolKind::Const => "constant", | ||
69 | SymbolKind::Static => "static", | ||
70 | SymbolKind::Enum => "enum", | ||
71 | SymbolKind::Variant => "enum_variant", | ||
72 | SymbolKind::Struct => "struct", | ||
73 | SymbolKind::Union => "union", | ||
74 | SymbolKind::Field => "field", | ||
75 | SymbolKind::Module => "module", | ||
76 | SymbolKind::Trait => "trait", | ||
77 | SymbolKind::Function => "function", | ||
78 | SymbolKind::TypeAlias => "type_alias", | ||
79 | SymbolKind::TypeParam => "type_param", | ||
80 | SymbolKind::LifetimeParam => "lifetime", | ||
81 | SymbolKind::Macro => "macro", | ||
82 | SymbolKind::Local => "variable", | ||
83 | SymbolKind::ValueParam => "value_param", | ||
84 | SymbolKind::SelfParam => "self_keyword", | ||
85 | SymbolKind::Impl => "self_type", | ||
86 | }, | ||
76 | HighlightTag::Attribute => "attribute", | 87 | HighlightTag::Attribute => "attribute", |
77 | HighlightTag::BoolLiteral => "bool_literal", | 88 | HighlightTag::BoolLiteral => "bool_literal", |
78 | HighlightTag::BuiltinType => "builtin_type", | 89 | HighlightTag::BuiltinType => "builtin_type", |
79 | HighlightTag::ByteLiteral => "byte_literal", | 90 | HighlightTag::ByteLiteral => "byte_literal", |
80 | HighlightTag::CharLiteral => "char_literal", | 91 | HighlightTag::CharLiteral => "char_literal", |
81 | HighlightTag::Comment => "comment", | 92 | HighlightTag::Comment => "comment", |
82 | HighlightTag::Constant => "constant", | ||
83 | HighlightTag::Enum => "enum", | ||
84 | HighlightTag::EnumVariant => "enum_variant", | ||
85 | HighlightTag::EscapeSequence => "escape_sequence", | 93 | HighlightTag::EscapeSequence => "escape_sequence", |
86 | HighlightTag::Field => "field", | ||
87 | HighlightTag::FormatSpecifier => "format_specifier", | 94 | HighlightTag::FormatSpecifier => "format_specifier", |
88 | HighlightTag::Function => "function", | 95 | HighlightTag::Dummy => "dummy", |
89 | HighlightTag::Generic => "generic", | ||
90 | HighlightTag::Keyword => "keyword", | 96 | HighlightTag::Keyword => "keyword", |
91 | HighlightTag::Lifetime => "lifetime", | ||
92 | HighlightTag::Punctuation => "punctuation", | 97 | HighlightTag::Punctuation => "punctuation", |
93 | HighlightTag::Macro => "macro", | ||
94 | HighlightTag::Method => "method", | ||
95 | HighlightTag::Module => "module", | ||
96 | HighlightTag::NumericLiteral => "numeric_literal", | 98 | HighlightTag::NumericLiteral => "numeric_literal", |
97 | HighlightTag::Operator => "operator", | 99 | HighlightTag::Operator => "operator", |
98 | HighlightTag::SelfKeyword => "self_keyword", | ||
99 | HighlightTag::SelfType => "self_type", | ||
100 | HighlightTag::Static => "static", | ||
101 | HighlightTag::StringLiteral => "string_literal", | 100 | HighlightTag::StringLiteral => "string_literal", |
102 | HighlightTag::Struct => "struct", | ||
103 | HighlightTag::Trait => "trait", | ||
104 | HighlightTag::TypeAlias => "type_alias", | ||
105 | HighlightTag::TypeParam => "type_param", | ||
106 | HighlightTag::Union => "union", | ||
107 | HighlightTag::ValueParam => "value_param", | ||
108 | HighlightTag::Local => "variable", | ||
109 | HighlightTag::UnresolvedReference => "unresolved_reference", | 101 | HighlightTag::UnresolvedReference => "unresolved_reference", |
110 | } | 102 | } |
111 | } | 103 | } |
@@ -118,7 +110,7 @@ impl fmt::Display for HighlightTag { | |||
118 | } | 110 | } |
119 | 111 | ||
120 | impl HighlightModifier { | 112 | impl HighlightModifier { |
121 | const ALL: &'static [HighlightModifier] = &[ | 113 | const ALL: &'static [HighlightModifier; HighlightModifier::Unsafe as u8 as usize + 1] = &[ |
122 | HighlightModifier::Attribute, | 114 | HighlightModifier::Attribute, |
123 | HighlightModifier::ControlFlow, | 115 | HighlightModifier::ControlFlow, |
124 | HighlightModifier::Definition, | 116 | HighlightModifier::Definition, |
@@ -126,9 +118,10 @@ impl HighlightModifier { | |||
126 | HighlightModifier::Injected, | 118 | HighlightModifier::Injected, |
127 | HighlightModifier::Mutable, | 119 | HighlightModifier::Mutable, |
128 | HighlightModifier::Consuming, | 120 | HighlightModifier::Consuming, |
129 | HighlightModifier::Unsafe, | ||
130 | HighlightModifier::Callable, | 121 | HighlightModifier::Callable, |
131 | HighlightModifier::Static, | 122 | HighlightModifier::Static, |
123 | HighlightModifier::Associated, | ||
124 | HighlightModifier::Unsafe, | ||
132 | ]; | 125 | ]; |
133 | 126 | ||
134 | fn as_str(self) -> &'static str { | 127 | fn as_str(self) -> &'static str { |
@@ -143,6 +136,7 @@ impl HighlightModifier { | |||
143 | HighlightModifier::Unsafe => "unsafe", | 136 | HighlightModifier::Unsafe => "unsafe", |
144 | HighlightModifier::Callable => "callable", | 137 | HighlightModifier::Callable => "callable", |
145 | HighlightModifier::Static => "static", | 138 | HighlightModifier::Static => "static", |
139 | HighlightModifier::Associated => "associated", | ||
146 | } | 140 | } |
147 | } | 141 | } |
148 | 142 | ||
@@ -209,6 +203,10 @@ impl ops::BitOr<HighlightModifier> for Highlight { | |||
209 | } | 203 | } |
210 | 204 | ||
211 | impl HighlightModifiers { | 205 | impl HighlightModifiers { |
206 | pub fn contains(self, m: HighlightModifier) -> bool { | ||
207 | self.0 & m.mask() == m.mask() | ||
208 | } | ||
209 | |||
212 | pub fn iter(self) -> impl Iterator<Item = HighlightModifier> { | 210 | pub fn iter(self) -> impl Iterator<Item = HighlightModifier> { |
213 | HighlightModifier::ALL.iter().copied().filter(move |it| self.0 & it.mask() == it.mask()) | 211 | HighlightModifier::ALL.iter().copied().filter(move |it| self.0 & it.mask() == it.mask()) |
214 | } | 212 | } |
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html index 6fb606a47..db6f32d33 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html | |||
@@ -40,17 +40,17 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
40 | <span class="keyword">struct</span> <span class="struct declaration">foo</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 40 | <span class="keyword">struct</span> <span class="struct declaration">foo</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
41 | 41 | ||
42 | <span class="keyword">impl</span> <span class="struct">foo</span> <span class="punctuation">{</span> | 42 | <span class="keyword">impl</span> <span class="struct">foo</span> <span class="punctuation">{</span> |
43 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="method declaration static">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 43 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
44 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="method declaration">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 44 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
45 | <span class="punctuation">}</span> | 45 | <span class="punctuation">}</span> |
46 | 46 | ||
47 | <span class="keyword">trait</span> <span class="trait declaration">t</span> <span class="punctuation">{</span> | 47 | <span class="keyword">trait</span> <span class="trait declaration">t</span> <span class="punctuation">{</span> |
48 | <span class="keyword">fn</span> <span class="method declaration static">t_is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 48 | <span class="keyword">fn</span> <span class="function declaration static associated">t_is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
49 | <span class="keyword">fn</span> <span class="method declaration">t_is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 49 | <span class="keyword">fn</span> <span class="function declaration associated">t_is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
50 | <span class="punctuation">}</span> | 50 | <span class="punctuation">}</span> |
51 | 51 | ||
52 | <span class="keyword">impl</span> <span class="trait">t</span> <span class="keyword">for</span> <span class="struct">foo</span> <span class="punctuation">{</span> | 52 | <span class="keyword">impl</span> <span class="trait">t</span> <span class="keyword">for</span> <span class="struct">foo</span> <span class="punctuation">{</span> |
53 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="method declaration static">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 53 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration static associated">is_static</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
54 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="method declaration">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 54 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">is_not_static</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
55 | <span class="punctuation">}</span> | 55 | <span class="punctuation">}</span> |
56 | </code></pre> \ No newline at end of file | 56 | </code></pre> \ No newline at end of file |
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html index 920956b51..4e511baa9 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html | |||
@@ -36,24 +36,24 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } | 36 | .unresolved_reference { color: #FC5555; text-decoration: wavy underline; } |
37 | </style> | 37 | </style> |
38 | <pre><code><span class="comment documentation">/// ```</span> | 38 | <pre><code><span class="comment documentation">/// ```</span> |
39 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="punctuation injected">_</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="punctuation injected">;</span><span class="punctuation injected"> | 39 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="punctuation injected">_</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="string_literal injected">"early doctests should not go boom"</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
40 | </span><span class="comment documentation">/// ```</span> | 40 | </span><span class="comment documentation">/// ```</span> |
41 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span> | 41 | <span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span> |
42 | <span class="field declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span><span class="punctuation">,</span> | 42 | <span class="field declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span><span class="punctuation">,</span> |
43 | <span class="punctuation">}</span> | 43 | <span class="punctuation">}</span> |
44 | 44 | ||
45 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> | 45 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
46 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="punctuation">;</span> | 46 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="constant declaration associated">bar</span><span class="punctuation">:</span> <span class="builtin_type">bool</span> <span class="operator">=</span> <span class="bool_literal">true</span><span class="punctuation">;</span> |
47 | 47 | ||
48 | <span class="comment documentation">/// Constructs a new `Foo`.</span> | 48 | <span class="comment documentation">/// Constructs a new `Foo`.</span> |
49 | <span class="comment documentation">///</span> | 49 | <span class="comment documentation">///</span> |
50 | <span class="comment documentation">/// # Examples</span> | 50 | <span class="comment documentation">/// # Examples</span> |
51 | <span class="comment documentation">///</span> | 51 | <span class="comment documentation">///</span> |
52 | <span class="comment documentation">/// ```</span> | 52 | <span class="comment documentation">/// ```</span> |
53 | <span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute attribute injected">#</span><span class="attribute attribute injected">!</span><span class="attribute attribute injected">[</span><span class="function attribute injected">allow</span><span class="punctuation attribute injected">(</span><span class="attribute attribute injected">unused_mut</span><span class="punctuation attribute injected">)</span><span class="attribute attribute injected">]</span> | 53 | <span class="comment documentation">/// #</span><span class="dummy injected"> </span><span class="attribute attribute injected">#</span><span class="attribute attribute injected">!</span><span class="attribute attribute injected">[</span><span class="function attribute injected">allow</span><span class="punctuation attribute injected">(</span><span class="attribute attribute injected">unused_mut</span><span class="punctuation attribute injected">)</span><span class="attribute attribute injected">]</span> |
54 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> | 54 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="keyword injected">mut</span><span class="dummy injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
55 | </span> <span class="comment documentation">/// ```</span> | 55 | </span> <span class="comment documentation">/// ```</span> |
56 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="method declaration static">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="struct">Foo</span> <span class="punctuation">{</span> | 56 | <span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration static associated">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
57 | <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">bar</span><span class="punctuation">:</span> <span class="bool_literal">true</span> <span class="punctuation">}</span> | 57 | <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">bar</span><span class="punctuation">:</span> <span class="bool_literal">true</span> <span class="punctuation">}</span> |
58 | <span class="punctuation">}</span> | 58 | <span class="punctuation">}</span> |
59 | 59 | ||
@@ -62,32 +62,32 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
62 | <span class="comment documentation">/// # Examples</span> | 62 | <span class="comment documentation">/// # Examples</span> |
63 | <span class="comment documentation">///</span> | 63 | <span class="comment documentation">///</span> |
64 | <span class="comment documentation">/// ```</span> | 64 | <span class="comment documentation">/// ```</span> |
65 | <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="generic injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="punctuation injected">;</span> | 65 | <span class="comment documentation">/// </span><span class="keyword injected">use</span><span class="dummy injected"> </span><span class="module injected">x</span><span class="operator injected">::</span><span class="module injected">y</span><span class="punctuation injected">;</span> |
66 | <span class="comment documentation">///</span> | 66 | <span class="comment documentation">///</span> |
67 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> | 67 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">foo</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> |
68 | <span class="comment documentation">///</span> | 68 | <span class="comment documentation">///</span> |
69 | <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span> | 69 | <span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span> |
70 | <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="punctuation injected">(</span><span class="generic injected">foo</span><span class="operator injected">.</span><span class="generic injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> | 70 | <span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="punctuation injected">(</span><span class="dummy injected">foo</span><span class="operator injected">.</span><span class="dummy injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span> |
71 | <span class="comment documentation">///</span> | 71 | <span class="comment documentation">///</span> |
72 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">bar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="generic injected"> </span><span class="operator injected">||</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="punctuation injected">;</span> | 72 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">bar</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="dummy injected"> </span><span class="operator injected">||</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="punctuation injected">;</span> |
73 | <span class="comment documentation">///</span> | 73 | <span class="comment documentation">///</span> |
74 | <span class="comment documentation">/// </span><span class="comment injected">/* multi-line | 74 | <span class="comment documentation">/// </span><span class="comment injected">/* multi-line |
75 | </span><span class="comment documentation">/// </span><span class="comment injected"> comment */</span> | 75 | </span><span class="comment documentation">/// </span><span class="comment injected"> comment */</span> |
76 | <span class="comment documentation">///</span> | 76 | <span class="comment documentation">///</span> |
77 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="string_literal injected">"Foo | 77 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">multi_line_string</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="string_literal injected">"Foo |
78 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> bar | 78 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> bar |
79 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> "</span><span class="punctuation injected">;</span> | 79 | </span><span class="comment documentation">/// </span><span class="string_literal injected"> "</span><span class="punctuation injected">;</span> |
80 | <span class="comment documentation">///</span> | 80 | <span class="comment documentation">///</span> |
81 | <span class="comment documentation">/// ```</span> | 81 | <span class="comment documentation">/// ```</span> |
82 | <span class="comment documentation">///</span> | 82 | <span class="comment documentation">///</span> |
83 | <span class="comment documentation">/// ```rust,no_run</span> | 83 | <span class="comment documentation">/// ```rust,no_run</span> |
84 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="variable declaration injected">foobar</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="operator injected">.</span><span class="function injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> | 84 | <span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="dummy injected"> </span><span class="variable declaration injected">foobar</span><span class="dummy injected"> </span><span class="operator injected">=</span><span class="dummy injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="operator injected">.</span><span class="function injected">bar</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected"> |
85 | </span> <span class="comment documentation">/// ```</span> | 85 | </span> <span class="comment documentation">/// ```</span> |
86 | <span class="comment documentation">///</span> | 86 | <span class="comment documentation">///</span> |
87 | <span class="comment documentation">/// ```sh</span> | 87 | <span class="comment documentation">/// ```sh</span> |
88 | <span class="comment documentation">/// echo 1</span> | 88 | <span class="comment documentation">/// echo 1</span> |
89 | <span class="comment documentation">/// ```</span> | 89 | <span class="comment documentation">/// ```</span> |
90 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="method declaration">foo</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">bool</span> <span class="punctuation">{</span> | 90 | <span class="keyword">pub</span> <span class="keyword">fn</span> <span class="function declaration associated">foo</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">bool</span> <span class="punctuation">{</span> |
91 | <span class="bool_literal">true</span> | 91 | <span class="bool_literal">true</span> |
92 | <span class="punctuation">}</span> | 92 | <span class="punctuation">}</span> |
93 | <span class="punctuation">}</span> | 93 | <span class="punctuation">}</span> |
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html index 31daf2bd0..7f18ad297 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html | |||
@@ -40,7 +40,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
40 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> | 40 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
41 | <span class="function">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span> | 41 | <span class="function">fixture</span><span class="punctuation">(</span><span class="string_literal">r#"</span> |
42 | <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</span> | 42 | <span class="keyword">trait</span> <span class="trait declaration">Foo</span> <span class="punctuation">{</span> |
43 | <span class="keyword">fn</span> <span class="method declaration static">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> | 43 | <span class="keyword">fn</span> <span class="function declaration static associated">foo</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
44 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span> | 44 | <span class="macro">println!</span><span class="punctuation">(</span><span class="string_literal">"2 + 2 = {}"</span><span class="punctuation">,</span> <span class="numeric_literal">4</span><span class="punctuation">)</span><span class="punctuation">;</span> |
45 | <span class="punctuation">}</span> | 45 | <span class="punctuation">}</span> |
46 | <span class="punctuation">}</span><span class="string_literal">"#</span> | 46 | <span class="punctuation">}</span><span class="string_literal">"#</span> |
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html index 67ec73f15..d26f48516 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html | |||
@@ -45,7 +45,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
45 | <span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="punctuation">;</span> | 45 | <span class="keyword">struct</span> <span class="struct declaration">HasUnsafeFn</span><span class="punctuation">;</span> |
46 | 46 | ||
47 | <span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="punctuation">{</span> | 47 | <span class="keyword">impl</span> <span class="struct">HasUnsafeFn</span> <span class="punctuation">{</span> |
48 | <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="method declaration unsafe">unsafe_method</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 48 | <span class="keyword unsafe">unsafe</span> <span class="keyword">fn</span> <span class="function declaration associated unsafe">unsafe_method</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
49 | <span class="punctuation">}</span> | 49 | <span class="punctuation">}</span> |
50 | 50 | ||
51 | <span class="keyword">struct</span> <span class="struct declaration">TypeForStaticMut</span> <span class="punctuation">{</span> | 51 | <span class="keyword">struct</span> <span class="struct declaration">TypeForStaticMut</span> <span class="punctuation">{</span> |
@@ -60,11 +60,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
60 | <span class="punctuation">}</span> | 60 | <span class="punctuation">}</span> |
61 | 61 | ||
62 | <span class="keyword">trait</span> <span class="trait declaration">DoTheAutoref</span> <span class="punctuation">{</span> | 62 | <span class="keyword">trait</span> <span class="trait declaration">DoTheAutoref</span> <span class="punctuation">{</span> |
63 | <span class="keyword">fn</span> <span class="method declaration">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span><span class="punctuation">;</span> | 63 | <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span><span class="punctuation">;</span> |
64 | <span class="punctuation">}</span> | 64 | <span class="punctuation">}</span> |
65 | 65 | ||
66 | <span class="keyword">impl</span> <span class="trait">DoTheAutoref</span> <span class="keyword">for</span> <span class="builtin_type">u16</span> <span class="punctuation">{</span> | 66 | <span class="keyword">impl</span> <span class="trait">DoTheAutoref</span> <span class="keyword">for</span> <span class="builtin_type">u16</span> <span class="punctuation">{</span> |
67 | <span class="keyword">fn</span> <span class="method declaration">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> | 67 | <span class="keyword">fn</span> <span class="function declaration associated">calls_autoref</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="punctuation">{</span><span class="punctuation">}</span> |
68 | <span class="punctuation">}</span> | 68 | <span class="punctuation">}</span> |
69 | 69 | ||
70 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> | 70 | <span class="keyword">fn</span> <span class="function declaration">main</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
@@ -78,7 +78,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
78 | <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">b</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span> <span class="operator">=></span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> | 78 | <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">b</span><span class="punctuation">:</span> <span class="numeric_literal">0</span> <span class="punctuation">}</span> <span class="operator">=></span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> |
79 | <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">a</span> <span class="punctuation">}</span> <span class="operator">=></span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> | 79 | <span class="union">Union</span> <span class="punctuation">{</span> <span class="field unsafe">a</span> <span class="punctuation">}</span> <span class="operator">=></span> <span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> |
80 | <span class="punctuation">}</span> | 80 | <span class="punctuation">}</span> |
81 | <span class="struct">HasUnsafeFn</span><span class="operator">.</span><span class="method unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 81 | <span class="struct">HasUnsafeFn</span><span class="operator">.</span><span class="function associated unsafe">unsafe_method</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
82 | 82 | ||
83 | <span class="comment">// unsafe deref</span> | 83 | <span class="comment">// unsafe deref</span> |
84 | <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="variable">x</span><span class="punctuation">;</span> | 84 | <span class="keyword">let</span> <span class="variable declaration">y</span> <span class="operator">=</span> <span class="operator unsafe">*</span><span class="variable">x</span><span class="punctuation">;</span> |
@@ -94,6 +94,6 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
94 | <span class="keyword">let</span> <span class="struct">Packed</span> <span class="punctuation">{</span> <span class="field">a</span><span class="punctuation">:</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">_a</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="punctuation">;</span> | 94 | <span class="keyword">let</span> <span class="struct">Packed</span> <span class="punctuation">{</span> <span class="field">a</span><span class="punctuation">:</span> <span class="keyword unsafe">ref</span> <span class="variable declaration">_a</span> <span class="punctuation">}</span> <span class="operator">=</span> <span class="variable">packed</span><span class="punctuation">;</span> |
95 | 95 | ||
96 | <span class="comment">// unsafe auto ref of packed field</span> | 96 | <span class="comment">// unsafe auto ref of packed field</span> |
97 | <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="operator">.</span><span class="method unsafe">calls_autoref</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 97 | <span class="variable">packed</span><span class="operator">.</span><span class="field">a</span><span class="operator">.</span><span class="function associated unsafe">calls_autoref</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
98 | <span class="punctuation">}</span> | 98 | <span class="punctuation">}</span> |
99 | <span class="punctuation">}</span></code></pre> \ No newline at end of file | 99 | <span class="punctuation">}</span></code></pre> \ No newline at end of file |
diff --git a/crates/ide/src/syntax_highlighting/test_data/highlighting.html b/crates/ide/src/syntax_highlighting/test_data/highlighting.html index 3530a5fdb..588e86a34 100644 --- a/crates/ide/src/syntax_highlighting/test_data/highlighting.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlighting.html | |||
@@ -65,25 +65,25 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
65 | <span class="punctuation">}</span> | 65 | <span class="punctuation">}</span> |
66 | 66 | ||
67 | <span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="punctuation">{</span> | 67 | <span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="punctuation">{</span> |
68 | <span class="keyword">fn</span> <span class="method declaration">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span><span class="punctuation">;</span> | 68 | <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span><span class="punctuation">;</span> |
69 | <span class="punctuation">}</span> | 69 | <span class="punctuation">}</span> |
70 | 70 | ||
71 | <span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="punctuation">{</span> | 71 | <span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
72 | <span class="keyword">fn</span> <span class="method declaration">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> | 72 | <span class="keyword">fn</span> <span class="function declaration associated">bar</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> |
73 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> | 73 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> |
74 | <span class="punctuation">}</span> | 74 | <span class="punctuation">}</span> |
75 | <span class="punctuation">}</span> | 75 | <span class="punctuation">}</span> |
76 | 76 | ||
77 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> | 77 | <span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span> |
78 | <span class="keyword">fn</span> <span class="method declaration">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">Foo</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> | 78 | <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">Foo</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> |
79 | <span class="value_param">f</span><span class="operator">.</span><span class="method consuming">baz</span><span class="punctuation">(</span><span class="self_keyword mutable consuming">self</span><span class="punctuation">)</span> | 79 | <span class="value_param">f</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="punctuation">(</span><span class="self_keyword mutable consuming">self</span><span class="punctuation">)</span> |
80 | <span class="punctuation">}</span> | 80 | <span class="punctuation">}</span> |
81 | 81 | ||
82 | <span class="keyword">fn</span> <span class="method declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span> | 82 | <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
83 | <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> | 83 | <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> |
84 | <span class="punctuation">}</span> | 84 | <span class="punctuation">}</span> |
85 | 85 | ||
86 | <span class="keyword">fn</span> <span class="method declaration">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> | 86 | <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">i32</span> <span class="punctuation">{</span> |
87 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> | 87 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> |
88 | <span class="punctuation">}</span> | 88 | <span class="punctuation">}</span> |
89 | <span class="punctuation">}</span> | 89 | <span class="punctuation">}</span> |
@@ -94,15 +94,15 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
94 | <span class="punctuation">}</span> | 94 | <span class="punctuation">}</span> |
95 | 95 | ||
96 | <span class="keyword">impl</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> | 96 | <span class="keyword">impl</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> |
97 | <span class="keyword">fn</span> <span class="method declaration">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">FooCopy</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">u32</span> <span class="punctuation">{</span> | 97 | <span class="keyword">fn</span> <span class="function declaration associated">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">FooCopy</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">u32</span> <span class="punctuation">{</span> |
98 | <span class="value_param">f</span><span class="operator">.</span><span class="method">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span> | 98 | <span class="value_param">f</span><span class="operator">.</span><span class="function associated">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span> |
99 | <span class="punctuation">}</span> | 99 | <span class="punctuation">}</span> |
100 | 100 | ||
101 | <span class="keyword">fn</span> <span class="method declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span> | 101 | <span class="keyword">fn</span> <span class="function declaration associated">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span> |
102 | <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> | 102 | <span class="self_keyword mutable">self</span><span class="operator">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span> |
103 | <span class="punctuation">}</span> | 103 | <span class="punctuation">}</span> |
104 | 104 | ||
105 | <span class="keyword">fn</span> <span class="method declaration">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">u32</span> <span class="punctuation">{</span> | 105 | <span class="keyword">fn</span> <span class="function declaration associated">quop</span><span class="punctuation">(</span><span class="operator">&</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-></span> <span class="builtin_type">u32</span> <span class="punctuation">{</span> |
106 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> | 106 | <span class="self_keyword">self</span><span class="operator">.</span><span class="field">x</span> |
107 | <span class="punctuation">}</span> | 107 | <span class="punctuation">}</span> |
108 | <span class="punctuation">}</span> | 108 | <span class="punctuation">}</span> |
@@ -178,17 +178,17 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
178 | 178 | ||
179 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> | 179 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> |
180 | <span class="keyword">let</span> <span class="variable declaration">foo2</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> | 180 | <span class="keyword">let</span> <span class="variable declaration">foo2</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> |
181 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="method">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 181 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="function associated">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
182 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="method mutable">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 182 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
183 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="method consuming">baz</span><span class="punctuation">(</span><span class="variable consuming">foo2</span><span class="punctuation">)</span><span class="punctuation">;</span> | 183 | <span class="variable mutable">foo</span><span class="operator">.</span><span class="function consuming associated">baz</span><span class="punctuation">(</span><span class="variable consuming">foo2</span><span class="punctuation">)</span><span class="punctuation">;</span> |
184 | 184 | ||
185 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">copy</span> <span class="operator">=</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> <span class="field">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> | 185 | <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">copy</span> <span class="operator">=</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> <span class="field">x</span> <span class="punctuation">}</span><span class="punctuation">;</span> |
186 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="method">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 186 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
187 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="method mutable">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> | 187 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="function mutable associated">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span> |
188 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="method">baz</span><span class="punctuation">(</span><span class="variable mutable">copy</span><span class="punctuation">)</span><span class="punctuation">;</span> | 188 | <span class="variable mutable">copy</span><span class="operator">.</span><span class="function associated">baz</span><span class="punctuation">(</span><span class="variable mutable">copy</span><span class="punctuation">)</span><span class="punctuation">;</span> |
189 | 189 | ||
190 | <span class="keyword">let</span> <span class="variable declaration callable">a</span> <span class="operator">=</span> <span class="punctuation">|</span><span class="value_param declaration">x</span><span class="punctuation">|</span> <span class="value_param">x</span><span class="punctuation">;</span> | 190 | <span class="keyword">let</span> <span class="variable declaration callable">a</span> <span class="operator">=</span> <span class="punctuation">|</span><span class="value_param declaration">x</span><span class="punctuation">|</span> <span class="value_param">x</span><span class="punctuation">;</span> |
191 | <span class="keyword">let</span> <span class="variable declaration callable">bar</span> <span class="operator">=</span> <span class="struct">Foo</span><span class="operator">::</span><span class="method">baz</span><span class="punctuation">;</span> | 191 | <span class="keyword">let</span> <span class="variable declaration callable">bar</span> <span class="operator">=</span> <span class="struct">Foo</span><span class="operator">::</span><span class="function associated">baz</span><span class="punctuation">;</span> |
192 | 192 | ||
193 | <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="punctuation">;</span> | 193 | <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="punctuation">;</span> |
194 | <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="punctuation">;</span> | 194 | <span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="punctuation">;</span> |
@@ -203,7 +203,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd | |||
203 | <span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span><span class="punctuation">*</span><span class="punctuation">;</span> | 203 | <span class="keyword">use</span> <span class="enum">Option</span><span class="operator">::</span><span class="punctuation">*</span><span class="punctuation">;</span> |
204 | 204 | ||
205 | <span class="keyword">impl</span><span class="punctuation"><</span><span class="type_param declaration">T</span><span class="punctuation">></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">T</span><span class="punctuation">></span> <span class="punctuation">{</span> | 205 | <span class="keyword">impl</span><span class="punctuation"><</span><span class="type_param declaration">T</span><span class="punctuation">></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">T</span><span class="punctuation">></span> <span class="punctuation">{</span> |
206 | <span class="keyword">fn</span> <span class="method declaration">and</span><span class="punctuation"><</span><span class="type_param declaration">U</span><span class="punctuation">></span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">other</span><span class="punctuation">:</span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">U</span><span class="punctuation">></span><span class="punctuation">)</span> <span class="operator">-></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">,</span> <span class="type_param">U</span><span class="punctuation">)</span><span class="punctuation">></span> <span class="punctuation">{</span> | 206 | <span class="keyword">fn</span> <span class="function declaration associated">and</span><span class="punctuation"><</span><span class="type_param declaration">U</span><span class="punctuation">></span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">other</span><span class="punctuation">:</span> <span class="enum">Option</span><span class="punctuation"><</span><span class="type_param">U</span><span class="punctuation">></span><span class="punctuation">)</span> <span class="operator">-></span> <span class="enum">Option</span><span class="punctuation"><</span><span class="punctuation">(</span><span class="type_param">T</span><span class="punctuation">,</span> <span class="type_param">U</span><span class="punctuation">)</span><span class="punctuation">></span> <span class="punctuation">{</span> |
207 | <span class="keyword control">match</span> <span class="value_param">other</span> <span class="punctuation">{</span> | 207 | <span class="keyword control">match</span> <span class="value_param">other</span> <span class="punctuation">{</span> |
208 | <span class="enum_variant">None</span> <span class="operator">=></span> <span class="macro">unimplemented!</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> | 208 | <span class="enum_variant">None</span> <span class="operator">=></span> <span class="macro">unimplemented!</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">,</span> |
209 | <span class="variable declaration">Nope</span> <span class="operator">=></span> <span class="variable">Nope</span><span class="punctuation">,</span> | 209 | <span class="variable declaration">Nope</span> <span class="operator">=></span> <span class="variable">Nope</span><span class="punctuation">,</span> |