8 files changed, 152 insertions, 28 deletions
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/tokens.rs
index 04b0a4480..56378385a 100644
--- a/crates/ra_syntax/src/ast/tokens.rs
+++ b/crates/ra_syntax/src/ast/tokens.rs
@@ -335,16 +335,26 @@ pub trait HasFormatSpecifier: AstToken {
                            }
                            c if c == '_' || c.is_alphabetic() => {
                                read_identifier(&mut chars, &mut callback);
-                                if chars.peek().and_then(|next| next.1.as_ref().ok()).copied()
+                                // can be either width (indicated by dollar sign, or type in which case
-                                    != Some('$')
+                                // the next sign has to be `}`)
-                                {
+                                let next =
-                                    continue;
+                                    chars.peek().and_then(|next| next.1.as_ref().ok()).copied();
-                                }
+                                match next {
-                                skip_char_and_emit(
+                                    Some('$') => skip_char_and_emit(
-                                    &mut chars,
+                                        &mut chars,
-                                    FormatSpecifier::DollarSign,
+                                        FormatSpecifier::DollarSign,
-                                    &mut callback,
+                                        &mut callback,
-                                );
+                                    ),
+                                    Some('}') => {
+                                        skip_char_and_emit(
+                                            &mut chars,
+                                            FormatSpecifier::Close,
+                                            &mut callback,
+                                        );
+                                        continue;
+                                    }
+                                    _ => continue,
+                                };
                            }
                            _ => {}
                        }
@@ -416,12 +426,11 @@ pub trait HasFormatSpecifier: AstToken {
                        }
                    }
-                    let mut cloned = chars.clone().take(2);
+                    if let Some((_, Ok('}'))) = chars.peek() {
-                    let first = cloned.next().and_then(|next| next.1.as_ref().ok()).copied();
+                        skip_char_and_emit(&mut chars, FormatSpecifier::Close, &mut callback);
-                    if first != Some('}') {
+                    } else {
                        continue;
                    }
-                    skip_char_and_emit(&mut chars, FormatSpecifier::Close, &mut callback);
                }
                _ => {
                    while let Some((_, Ok(next_char))) = chars.peek() {
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
new file mode 100644
index 000000000..8eb583ef8
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -0,0 +1,40 @@
+[email protected]
+  [email protected]
+    [email protected] "trait"
+    [email protected] " "
+    [email protected]
+      [email protected] "T"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n  "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "default"
+      [email protected] " "
+      [email protected]
+        [email protected] "const"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "u8"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
+error 19..19: expected BANG
+error 19..19: expected `{`, `[`, `(`
+error 19..19: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rs b/crates/ra_syntax/test_data/parser/err/0043_default_const.rs
new file mode 100644
index 000000000..80f15474a
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rs
@@ -0,0 +1,3 @@
+trait T {
+  default const f: u8 = 0;
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 9be441110..53f7ebaf9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -17,23 +17,29 @@ [email protected]
      [email protected] "{"
      [email protected] "}"
  [email protected] "\n"
-  ERROR@25..31
+  CONST_DEF@25..46
    [email protected] "unsafe"
-  [email protected] " "
+    [email protected] " "
-  [email protected]
    [email protected] "const"
    [email protected] " "
-    [email protected] "fn"
+    [email protected]
+      [email protected] "fn"
    [email protected] " "
-    [email protected]
+    [email protected]
-      [email protected] "bar"
+      [email protected]
-    [email protected]
+        [email protected]
-      [email protected] "("
+          [email protected]
-      [email protected] ")"
+            [email protected] "bar"
-    [email protected] " "
+          [email protected]
-    [email protected]
+            [email protected] "("
-      [email protected] "{"
+            [email protected] ")"
-      [email protected] "}"
+  [email protected] " "
+  [email protected]
+    [email protected] "{"
+    [email protected] "}"
  [email protected] "\n"
 error 6..6: expected existential, fn, trait or impl
-error 31..31: expected existential, fn, trait or impl
+error 38..38: expected a name
+error 40..40: expected COLON
+error 46..46: expected SEMICOLON
+error 47..47: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
new file mode 100644
index 000000000..a9eda5668
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
@@ -0,0 +1,18 @@
+[email protected]
+  [email protected]
+    [email protected] "default"
+    [email protected] " "
+    [email protected] "unsafe"
+    [email protected] " "
+    [email protected] "impl"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "Foo"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs
new file mode 100644
index 000000000..ba0998ff4
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs
@@ -0,0 +1 @@
+default unsafe impl Foo {}
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
new file mode 100644
index 000000000..dab0247ee
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -0,0 +1,44 @@
+[email protected]
+  [email protected]
+    [email protected] "impl"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "T"
+    [email protected] " "
+    [email protected] "for"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "Foo"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n  "
+      [email protected]
+        [email protected] "default"
+        [email protected] " "
+        [email protected] "const"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "u8"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs
new file mode 100644
index 000000000..dfb3b92dc
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs
@@ -0,0 +1,3 @@
+impl T for Foo {
+  default const f: u8 = 0;
+}

diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/tokens.rs index 04b0a4480..56378385a 100644 --- a/crates/ra_syntax/src/ast/tokens.rs +++ b/crates/ra_syntax/src/ast/tokens.rs
@@ -335,16 +335,26 @@ pub trait HasFormatSpecifier: AstToken {
335	}	335	}
336	c if c == '_' \|\| c.is_alphabetic() => {	336	c if c == '_' \|\| c.is_alphabetic() => {
337	read_identifier(&mut chars, &mut callback);	337	read_identifier(&mut chars, &mut callback);
338	if chars.peek().and_then(\|next\| next.1.as_ref().ok()).copied()	338	// can be either width (indicated by dollar sign, or type in which case
339	!= Some('$')	339	// the next sign has to be `}`)
340	{	340	let next =
341	continue;	341	chars.peek().and_then(\|next\| next.1.as_ref().ok()).copied();
342	}	342	match next {
343	skip_char_and_emit(	343	Some('$') => skip_char_and_emit(
344	&mut chars,	344	&mut chars,
345	FormatSpecifier::DollarSign,	345	FormatSpecifier::DollarSign,
346	&mut callback,	346	&mut callback,
347	);	347	),
		348	Some('}') => {
		349	skip_char_and_emit(
		350	&mut chars,
		351	FormatSpecifier::Close,
		352	&mut callback,
		353	);
		354	continue;
		355	}
		356	_ => continue,
		357	};
348	}	358	}
349	_ => {}	359	_ => {}
350	}	360	}
@@ -416,12 +426,11 @@ pub trait HasFormatSpecifier: AstToken {
416	}	426	}
417	}	427	}
418		428
419	let mut cloned = chars.clone().take(2);	429	if let Some((_, Ok('}'))) = chars.peek() {
420	let first = cloned.next().and_then(\|next\| next.1.as_ref().ok()).copied();	430	skip_char_and_emit(&mut chars, FormatSpecifier::Close, &mut callback);
421	if first != Some('}') {	431	} else {
422	continue;	432	continue;
423	}	433	}
424	skip_char_and_emit(&mut chars, FormatSpecifier::Close, &mut callback);
425	}	434	}
426	_ => {	435	_ => {
427	while let Some((_, Ok(next_char))) = chars.peek() {	436	while let Some((_, Ok(next_char))) = chars.peek() {


diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rast b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast new file mode 100644 index 000000000..8eb583ef8 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rast
@@ -0,0 +1,40 @@
		1	[email protected]
		2	[email protected]
		3	[email protected] "trait"
		4	[email protected] " "
		5	[email protected]
		6	[email protected] "T"
		7	[email protected] " "
		8	[email protected]
		9	[email protected] "{"
		10	[email protected] "\n "
		11	[email protected]
		12	[email protected]
		13	[email protected]
		14	[email protected]
		15	[email protected] "default"
		16	[email protected] " "
		17	[email protected]
		18	[email protected] "const"
		19	[email protected] " "
		20	[email protected]
		21	[email protected] "f"
		22	[email protected] ":"
		23	[email protected] " "
		24	[email protected]
		25	[email protected]
		26	[email protected]
		27	[email protected]
		28	[email protected] "u8"
		29	[email protected] " "
		30	[email protected] "="
		31	[email protected] " "
		32	[email protected]
		33	[email protected] "0"
		34	[email protected] ";"
		35	[email protected] "\n"
		36	[email protected] "}"
		37	[email protected] "\n"
		38	error 19..19: expected BANG
		39	error 19..19: expected `{`, `[`, `(`
		40	error 19..19: expected SEMICOLON


diff --git a/crates/ra_syntax/test_data/parser/err/0043_default_const.rs b/crates/ra_syntax/test_data/parser/err/0043_default_const.rs new file mode 100644 index 000000000..80f15474a --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0043_default_const.rs
@@ -0,0 +1,3 @@
		1	trait T {
		2	default const f: u8 = 0;
		3	}


diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index 9be441110..53f7ebaf9 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -17,23 +17,29 @@ [email protected]
17	[email protected] "{"	17	[email protected] "{"
18	[email protected] "}"	18	[email protected] "}"
19	[email protected] "\n"	19	[email protected] "\n"
20	ERROR@25..31	20	CONST_DEF@25..46
21	[email protected] "unsafe"	21	[email protected] "unsafe"
22	[email protected] " "	22	[email protected] " "
23	[email protected]
24	[email protected] "const"	23	[email protected] "const"
25	[email protected] " "	24	[email protected] " "
26	[email protected] "fn"	25	[email protected]
		26	[email protected] "fn"
27	[email protected] " "	27	[email protected] " "
28	[email protected]	28	[email protected]
29	[email protected] "bar"	29	[email protected]
30	[email protected]	30	[email protected]
31	[email protected] "("	31	[email protected]
32	[email protected] ")"	32	[email protected] "bar"
33	[email protected] " "	33	[email protected]
34	[email protected]	34	[email protected] "("
35	[email protected] "{"	35	[email protected] ")"
36	[email protected] "}"	36	[email protected] " "
		37	[email protected]
		38	[email protected] "{"
		39	[email protected] "}"
37	[email protected] "\n"	40	[email protected] "\n"
38	error 6..6: expected existential, fn, trait or impl	41	error 6..6: expected existential, fn, trait or impl
39	error 31..31: expected existential, fn, trait or impl	42	error 38..38: expected a name
		43	error 40..40: expected COLON
		44	error 46..46: expected SEMICOLON
		45	error 47..47: expected an item


diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast new file mode 100644 index 000000000..a9eda5668 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rast
@@ -0,0 +1,18 @@
		1	[email protected]
		2	[email protected]
		3	[email protected] "default"
		4	[email protected] " "
		5	[email protected] "unsafe"
		6	[email protected] " "
		7	[email protected] "impl"
		8	[email protected] " "
		9	[email protected]
		10	[email protected]
		11	[email protected]
		12	[email protected]
		13	[email protected] "Foo"
		14	[email protected] " "
		15	[email protected]
		16	[email protected] "{"
		17	[email protected] "}"
		18	[email protected] "\n"


diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs new file mode 100644 index 000000000..ba0998ff4 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_impl.rs
@@ -0,0 +1 @@
			default unsafe impl Foo {}


diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast new file mode 100644 index 000000000..dab0247ee --- /dev/null +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rast
@@ -0,0 +1,44 @@
		1	[email protected]
		2	[email protected]
		3	[email protected] "impl"
		4	[email protected] " "
		5	[email protected]
		6	[email protected]
		7	[email protected]
		8	[email protected]
		9	[email protected] "T"
		10	[email protected] " "
		11	[email protected] "for"
		12	[email protected] " "
		13	[email protected]
		14	[email protected]
		15	[email protected]
		16	[email protected]
		17	[email protected] "Foo"
		18	[email protected] " "
		19	[email protected]
		20	[email protected] "{"
		21	[email protected] "\n "
		22	[email protected]
		23	[email protected] "default"
		24	[email protected] " "
		25	[email protected] "const"
		26	[email protected] " "
		27	[email protected]
		28	[email protected] "f"
		29	[email protected] ":"
		30	[email protected] " "
		31	[email protected]
		32	[email protected]
		33	[email protected]
		34	[email protected]
		35	[email protected] "u8"
		36	[email protected] " "
		37	[email protected] "="
		38	[email protected] " "
		39	[email protected]
		40	[email protected] "0"
		41	[email protected] ";"
		42	[email protected] "\n"
		43	[email protected] "}"
		44	[email protected] "\n"


diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs new file mode 100644 index 000000000..dfb3b92dc --- /dev/null +++ b/crates/ra_syntax/test_data/parser/ok/0066_default_const.rs
@@ -0,0 +1,3 @@
		1	impl T for Foo {
		2	default const f: u8 = 0;
		3	}