diff options
11 files changed, 109 insertions, 11 deletions
diff --git a/crates/ra_syntax/src/lexer.rs b/crates/ra_syntax/src/lexer.rs index c6acd095e..f9362120e 100644 --- a/crates/ra_syntax/src/lexer.rs +++ b/crates/ra_syntax/src/lexer.rs | |||
@@ -190,17 +190,19 @@ fn next_token_inner(c: char, ptr: &mut Ptr) -> SyntaxKind { | |||
190 | } | 190 | } |
191 | 191 | ||
192 | fn scan_ident(c: char, ptr: &mut Ptr) -> SyntaxKind { | 192 | fn scan_ident(c: char, ptr: &mut Ptr) -> SyntaxKind { |
193 | let is_single_letter = match ptr.current() { | 193 | let is_raw = match (c, ptr.current()) { |
194 | None => true, | 194 | ('r', Some('#')) => { |
195 | Some(c) if !is_ident_continue(c) => true, | 195 | ptr.bump(); |
196 | true | ||
197 | } | ||
198 | ('_', Some(c)) if !is_ident_continue(c) => return UNDERSCORE, | ||
196 | _ => false, | 199 | _ => false, |
197 | }; | 200 | }; |
198 | if is_single_letter { | ||
199 | return if c == '_' { UNDERSCORE } else { IDENT }; | ||
200 | } | ||
201 | ptr.bump_while(is_ident_continue); | 201 | ptr.bump_while(is_ident_continue); |
202 | if let Some(kind) = SyntaxKind::from_keyword(ptr.current_token_text()) { | 202 | if !is_raw { |
203 | return kind; | 203 | if let Some(kind) = SyntaxKind::from_keyword(ptr.current_token_text()) { |
204 | return kind; | ||
205 | } | ||
204 | } | 206 | } |
205 | IDENT | 207 | IDENT |
206 | } | 208 | } |
diff --git a/crates/ra_syntax/src/lexer/strings.rs b/crates/ra_syntax/src/lexer/strings.rs index 0865b7f3b..5c1cf3e9c 100644 --- a/crates/ra_syntax/src/lexer/strings.rs +++ b/crates/ra_syntax/src/lexer/strings.rs | |||
@@ -5,7 +5,8 @@ use crate::lexer::ptr::Ptr; | |||
5 | pub(crate) fn is_string_literal_start(c: char, c1: Option<char>, c2: Option<char>) -> bool { | 5 | pub(crate) fn is_string_literal_start(c: char, c1: Option<char>, c2: Option<char>) -> bool { |
6 | match (c, c1, c2) { | 6 | match (c, c1, c2) { |
7 | ('r', Some('"'), _) | 7 | ('r', Some('"'), _) |
8 | | ('r', Some('#'), _) | 8 | | ('r', Some('#'), Some('"')) |
9 | | ('r', Some('#'), Some('#')) | ||
9 | | ('b', Some('"'), _) | 10 | | ('b', Some('"'), _) |
10 | | ('b', Some('\''), _) | 11 | | ('b', Some('\''), _) |
11 | | ('b', Some('r'), Some('"')) | 12 | | ('b', Some('r'), Some('"')) |
diff --git a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.rs b/crates/ra_syntax/tests/data/lexer/0016_raw_ident.rs new file mode 100644 index 000000000..b40a1b6a2 --- /dev/null +++ b/crates/ra_syntax/tests/data/lexer/0016_raw_ident.rs | |||
@@ -0,0 +1 @@ | |||
r#raw_ident | |||
diff --git a/crates/ra_syntax/tests/data/lexer/0016_raw_ident.txt b/crates/ra_syntax/tests/data/lexer/0016_raw_ident.txt new file mode 100644 index 000000000..484689693 --- /dev/null +++ b/crates/ra_syntax/tests/data/lexer/0016_raw_ident.txt | |||
@@ -0,0 +1,2 @@ | |||
1 | IDENT 11 "r#raw_ident" | ||
2 | WHITESPACE 1 "\n" | ||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.rs b/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.rs new file mode 100644 index 000000000..8380d1e79 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.rs | |||
@@ -0,0 +1,2 @@ | |||
1 | fn r#foo() { | ||
2 | } | ||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.txt b/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.txt new file mode 100644 index 000000000..dcd055d86 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0039_raw_fn_item.txt | |||
@@ -0,0 +1,15 @@ | |||
1 | SOURCE_FILE@[0; 15) | ||
2 | FN_DEF@[0; 14) | ||
3 | FN_KW@[0; 2) | ||
4 | WHITESPACE@[2; 3) | ||
5 | NAME@[3; 8) | ||
6 | IDENT@[3; 8) "r#foo" | ||
7 | PARAM_LIST@[8; 10) | ||
8 | L_PAREN@[8; 9) | ||
9 | R_PAREN@[9; 10) | ||
10 | WHITESPACE@[10; 11) | ||
11 | BLOCK@[11; 14) | ||
12 | L_CURLY@[11; 12) | ||
13 | WHITESPACE@[12; 13) | ||
14 | R_CURLY@[13; 14) | ||
15 | WHITESPACE@[14; 15) | ||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.rs b/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.rs new file mode 100644 index 000000000..098a60a72 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.rs | |||
@@ -0,0 +1,3 @@ | |||
1 | struct S { | ||
2 | r#foo: u32 | ||
3 | } \ No newline at end of file | ||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.txt b/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.txt new file mode 100644 index 000000000..361e53152 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0040_raw_struct_item_field.txt | |||
@@ -0,0 +1,22 @@ | |||
1 | SOURCE_FILE@[0; 27) | ||
2 | STRUCT_DEF@[0; 27) | ||
3 | STRUCT_KW@[0; 6) | ||
4 | WHITESPACE@[6; 7) | ||
5 | NAME@[7; 8) | ||
6 | IDENT@[7; 8) "S" | ||
7 | WHITESPACE@[8; 9) | ||
8 | NAMED_FIELD_DEF_LIST@[9; 27) | ||
9 | L_CURLY@[9; 10) | ||
10 | WHITESPACE@[10; 15) | ||
11 | NAMED_FIELD_DEF@[15; 25) | ||
12 | NAME@[15; 20) | ||
13 | IDENT@[15; 20) "r#foo" | ||
14 | COLON@[20; 21) | ||
15 | WHITESPACE@[21; 22) | ||
16 | PATH_TYPE@[22; 25) | ||
17 | PATH@[22; 25) | ||
18 | PATH_SEGMENT@[22; 25) | ||
19 | NAME_REF@[22; 25) | ||
20 | IDENT@[22; 25) "u32" | ||
21 | WHITESPACE@[25; 26) | ||
22 | R_CURLY@[26; 27) | ||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.rs b/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.rs new file mode 100644 index 000000000..d59a6d347 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.rs | |||
@@ -0,0 +1 @@ | |||
fn foo() { let r#struct = 92; let r#trait = r#struct * 2; } \ No newline at end of file | |||
diff --git a/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.txt b/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.txt new file mode 100644 index 000000000..f03ed17f5 --- /dev/null +++ b/crates/ra_syntax/tests/data/parser/ok/0041_raw_keywords.txt | |||
@@ -0,0 +1,49 @@ | |||
1 | SOURCE_FILE@[0; 59) | ||
2 | FN_DEF@[0; 59) | ||
3 | FN_KW@[0; 2) | ||
4 | WHITESPACE@[2; 3) | ||
5 | NAME@[3; 6) | ||
6 | IDENT@[3; 6) "foo" | ||
7 | PARAM_LIST@[6; 8) | ||
8 | L_PAREN@[6; 7) | ||
9 | R_PAREN@[7; 8) | ||
10 | WHITESPACE@[8; 9) | ||
11 | BLOCK@[9; 59) | ||
12 | L_CURLY@[9; 10) | ||
13 | WHITESPACE@[10; 11) | ||
14 | LET_STMT@[11; 29) | ||
15 | LET_KW@[11; 14) | ||
16 | WHITESPACE@[14; 15) | ||
17 | BIND_PAT@[15; 23) | ||
18 | NAME@[15; 23) | ||
19 | IDENT@[15; 23) "r#struct" | ||
20 | WHITESPACE@[23; 24) | ||
21 | EQ@[24; 25) | ||
22 | WHITESPACE@[25; 26) | ||
23 | LITERAL@[26; 28) | ||
24 | INT_NUMBER@[26; 28) "92" | ||
25 | SEMI@[28; 29) | ||
26 | WHITESPACE@[29; 30) | ||
27 | LET_STMT@[30; 57) | ||
28 | LET_KW@[30; 33) | ||
29 | WHITESPACE@[33; 34) | ||
30 | BIND_PAT@[34; 41) | ||
31 | NAME@[34; 41) | ||
32 | IDENT@[34; 41) "r#trait" | ||
33 | WHITESPACE@[41; 42) | ||
34 | EQ@[42; 43) | ||
35 | WHITESPACE@[43; 44) | ||
36 | BIN_EXPR@[44; 56) | ||
37 | PATH_EXPR@[44; 52) | ||
38 | PATH@[44; 52) | ||
39 | PATH_SEGMENT@[44; 52) | ||
40 | NAME_REF@[44; 52) | ||
41 | IDENT@[44; 52) "r#struct" | ||
42 | WHITESPACE@[52; 53) | ||
43 | STAR@[53; 54) | ||
44 | WHITESPACE@[54; 55) | ||
45 | LITERAL@[55; 56) | ||
46 | INT_NUMBER@[55; 56) "2" | ||
47 | SEMI@[56; 57) | ||
48 | WHITESPACE@[57; 58) | ||
49 | R_CURLY@[58; 59) | ||
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs index 5597aae5a..d6eabce6c 100644 --- a/crates/tools/src/main.rs +++ b/crates/tools/src/main.rs | |||
@@ -150,10 +150,10 @@ fn existing_tests(dir: &Path, ok: bool) -> Result<HashMap<String, (PathBuf, Test | |||
150 | fn install_code_extension() -> Result<()> { | 150 | fn install_code_extension() -> Result<()> { |
151 | run("cargo install --path crates/ra_lsp_server --force", ".")?; | 151 | run("cargo install --path crates/ra_lsp_server --force", ".")?; |
152 | if cfg!(windows) { | 152 | if cfg!(windows) { |
153 | run(r"cmd.exe /c npm.cmd install", "./editors/code")?; | 153 | run(r"cmd.exe /c npm.cmd ci", "./editors/code")?; |
154 | run(r"cmd.exe /c npm.cmd run package", "./editors/code")?; | 154 | run(r"cmd.exe /c npm.cmd run package", "./editors/code")?; |
155 | } else { | 155 | } else { |
156 | run(r"npm install", "./editors/code")?; | 156 | run(r"npm ci", "./editors/code")?; |
157 | run(r"npm run package", "./editors/code")?; | 157 | run(r"npm run package", "./editors/code")?; |
158 | } | 158 | } |
159 | if cfg!(windows) { | 159 | if cfg!(windows) { |