diff options
Diffstat (limited to 'crates/ide/src/syntax_highlighting')
-rw-r--r-- | crates/ide/src/syntax_highlighting/tags.rs | 3 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/tests.rs | 39 |
2 files changed, 42 insertions, 0 deletions
diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index 49ec94bdc..c1b817f06 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs | |||
@@ -62,6 +62,7 @@ pub enum HighlightModifier { | |||
62 | Documentation, | 62 | Documentation, |
63 | Injected, | 63 | Injected, |
64 | Mutable, | 64 | Mutable, |
65 | Consuming, | ||
65 | Unsafe, | 66 | Unsafe, |
66 | } | 67 | } |
67 | 68 | ||
@@ -119,6 +120,7 @@ impl HighlightModifier { | |||
119 | HighlightModifier::Documentation, | 120 | HighlightModifier::Documentation, |
120 | HighlightModifier::Injected, | 121 | HighlightModifier::Injected, |
121 | HighlightModifier::Mutable, | 122 | HighlightModifier::Mutable, |
123 | HighlightModifier::Consuming, | ||
122 | HighlightModifier::Unsafe, | 124 | HighlightModifier::Unsafe, |
123 | ]; | 125 | ]; |
124 | 126 | ||
@@ -130,6 +132,7 @@ impl HighlightModifier { | |||
130 | HighlightModifier::Documentation => "documentation", | 132 | HighlightModifier::Documentation => "documentation", |
131 | HighlightModifier::Injected => "injected", | 133 | HighlightModifier::Injected => "injected", |
132 | HighlightModifier::Mutable => "mutable", | 134 | HighlightModifier::Mutable => "mutable", |
135 | HighlightModifier::Consuming => "consuming", | ||
133 | HighlightModifier::Unsafe => "unsafe", | 136 | HighlightModifier::Unsafe => "unsafe", |
134 | } | 137 | } |
135 | } | 138 | } |
diff --git a/crates/ide/src/syntax_highlighting/tests.rs b/crates/ide/src/syntax_highlighting/tests.rs index 94f37d773..ccb76f552 100644 --- a/crates/ide/src/syntax_highlighting/tests.rs +++ b/crates/ide/src/syntax_highlighting/tests.rs | |||
@@ -12,6 +12,12 @@ fn test_highlighting() { | |||
12 | use inner::{self as inner_mod}; | 12 | use inner::{self as inner_mod}; |
13 | mod inner {} | 13 | mod inner {} |
14 | 14 | ||
15 | // Needed for function consuming vs normal | ||
16 | pub mod marker { | ||
17 | #[lang = "copy"] | ||
18 | pub trait Copy {} | ||
19 | } | ||
20 | |||
15 | #[derive(Clone, Debug)] | 21 | #[derive(Clone, Debug)] |
16 | struct Foo { | 22 | struct Foo { |
17 | pub x: i32, | 23 | pub x: i32, |
@@ -36,6 +42,29 @@ impl Foo { | |||
36 | fn qux(&mut self) { | 42 | fn qux(&mut self) { |
37 | self.x = 0; | 43 | self.x = 0; |
38 | } | 44 | } |
45 | |||
46 | fn quop(&self) -> i32 { | ||
47 | self.x | ||
48 | } | ||
49 | } | ||
50 | |||
51 | #[derive(Copy, Clone)] | ||
52 | struct FooCopy { | ||
53 | x: u32, | ||
54 | } | ||
55 | |||
56 | impl FooCopy { | ||
57 | fn baz(self) -> u32 { | ||
58 | self.x | ||
59 | } | ||
60 | |||
61 | fn qux(&mut self) { | ||
62 | self.x = 0; | ||
63 | } | ||
64 | |||
65 | fn quop(&self) -> u32 { | ||
66 | self.x | ||
67 | } | ||
39 | } | 68 | } |
40 | 69 | ||
41 | static mut STATIC_MUT: i32 = 0; | 70 | static mut STATIC_MUT: i32 = 0; |
@@ -87,6 +116,16 @@ fn main() { | |||
87 | let Foo { x: z, y } = Foo { x: z, y }; | 116 | let Foo { x: z, y } = Foo { x: z, y }; |
88 | 117 | ||
89 | y; | 118 | y; |
119 | |||
120 | let mut foo = Foo { x, y: x }; | ||
121 | foo.quop(); | ||
122 | foo.qux(); | ||
123 | foo.baz(); | ||
124 | |||
125 | let mut copy = FooCopy { x }; | ||
126 | copy.quop(); | ||
127 | copy.qux(); | ||
128 | copy.baz(); | ||
90 | } | 129 | } |
91 | 130 | ||
92 | enum Option<T> { | 131 | enum Option<T> { |