diff options
Diffstat (limited to 'crates/ra_syntax/src')
-rw-r--r-- | crates/ra_syntax/src/algo.rs (renamed from crates/ra_syntax/src/algo/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast.rs (renamed from crates/ra_syntax/src/ast/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 4 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar.rs (renamed from crates/ra_syntax/src/grammar/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar/expressions.rs (renamed from crates/ra_syntax/src/grammar/expressions/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar/items.rs (renamed from crates/ra_syntax/src/grammar/items/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/lexer.rs (renamed from crates/ra_syntax/src/lexer/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/parser_impl.rs (renamed from crates/ra_syntax/src/parser_impl/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/string_lexing.rs (renamed from crates/ra_syntax/src/string_lexing/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/syntax_kinds.rs (renamed from crates/ra_syntax/src/syntax_kinds/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/syntax_kinds/generated.rs | 1 | ||||
-rw-r--r-- | crates/ra_syntax/src/syntax_kinds/generated.rs.tera | 1 | ||||
-rw-r--r-- | crates/ra_syntax/src/validation.rs (renamed from crates/ra_syntax/src/validation/mod.rs) | 0 | ||||
-rw-r--r-- | crates/ra_syntax/src/yellow.rs (renamed from crates/ra_syntax/src/yellow/mod.rs) | 0 |
14 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_syntax/src/algo/mod.rs b/crates/ra_syntax/src/algo.rs index 4b3548ea9..4b3548ea9 100644 --- a/crates/ra_syntax/src/algo/mod.rs +++ b/crates/ra_syntax/src/algo.rs | |||
diff --git a/crates/ra_syntax/src/ast/mod.rs b/crates/ra_syntax/src/ast.rs index 91c67119f..91c67119f 100644 --- a/crates/ra_syntax/src/ast/mod.rs +++ b/crates/ra_syntax/src/ast.rs | |||
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index 53cd2118f..eed67637e 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -25,9 +25,9 @@ Grammar( | |||
25 | ["^", "CARET"], | 25 | ["^", "CARET"], |
26 | ["%", "PERCENT"], | 26 | ["%", "PERCENT"], |
27 | ], | 27 | ], |
28 | // TODO: Confirm surmision: the tokens which cannot be recorded in a single UTF-8 byte | 28 | // Tokens for which the longest match must be chosen (e.g. `..` is a DOTDOT, but `.` is a DOT) |
29 | multi_byte_tokens: [ | 29 | multi_byte_tokens: [ |
30 | [".", "DOT"], // Note: DOT is here because <TODO: REASON> | 30 | [".", "DOT"], |
31 | ["..", "DOTDOT"], | 31 | ["..", "DOTDOT"], |
32 | ["...", "DOTDOTDOT"], | 32 | ["...", "DOTDOTDOT"], |
33 | ["..=", "DOTDOTEQ"], | 33 | ["..=", "DOTDOTEQ"], |
diff --git a/crates/ra_syntax/src/grammar/mod.rs b/crates/ra_syntax/src/grammar.rs index 06a37d648..06a37d648 100644 --- a/crates/ra_syntax/src/grammar/mod.rs +++ b/crates/ra_syntax/src/grammar.rs | |||
diff --git a/crates/ra_syntax/src/grammar/expressions/mod.rs b/crates/ra_syntax/src/grammar/expressions.rs index 60c8602f9..60c8602f9 100644 --- a/crates/ra_syntax/src/grammar/expressions/mod.rs +++ b/crates/ra_syntax/src/grammar/expressions.rs | |||
diff --git a/crates/ra_syntax/src/grammar/items/mod.rs b/crates/ra_syntax/src/grammar/items.rs index 4473c2fab..4473c2fab 100644 --- a/crates/ra_syntax/src/grammar/items/mod.rs +++ b/crates/ra_syntax/src/grammar/items.rs | |||
diff --git a/crates/ra_syntax/src/lexer/mod.rs b/crates/ra_syntax/src/lexer.rs index f388da273..f388da273 100644 --- a/crates/ra_syntax/src/lexer/mod.rs +++ b/crates/ra_syntax/src/lexer.rs | |||
diff --git a/crates/ra_syntax/src/parser_impl/mod.rs b/crates/ra_syntax/src/parser_impl.rs index cb6e370ac..cb6e370ac 100644 --- a/crates/ra_syntax/src/parser_impl/mod.rs +++ b/crates/ra_syntax/src/parser_impl.rs | |||
diff --git a/crates/ra_syntax/src/string_lexing/mod.rs b/crates/ra_syntax/src/string_lexing.rs index 94853331f..94853331f 100644 --- a/crates/ra_syntax/src/string_lexing/mod.rs +++ b/crates/ra_syntax/src/string_lexing.rs | |||
diff --git a/crates/ra_syntax/src/syntax_kinds/mod.rs b/crates/ra_syntax/src/syntax_kinds.rs index d53886676..d53886676 100644 --- a/crates/ra_syntax/src/syntax_kinds/mod.rs +++ b/crates/ra_syntax/src/syntax_kinds.rs | |||
diff --git a/crates/ra_syntax/src/syntax_kinds/generated.rs b/crates/ra_syntax/src/syntax_kinds/generated.rs index c43a8bf65..3a869ad34 100644 --- a/crates/ra_syntax/src/syntax_kinds/generated.rs +++ b/crates/ra_syntax/src/syntax_kinds/generated.rs | |||
@@ -560,4 +560,3 @@ impl SyntaxKind { | |||
560 | Some(tok) | 560 | Some(tok) |
561 | } | 561 | } |
562 | } | 562 | } |
563 | |||
diff --git a/crates/ra_syntax/src/syntax_kinds/generated.rs.tera b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera index c37e57702..21f9444b1 100644 --- a/crates/ra_syntax/src/syntax_kinds/generated.rs.tera +++ b/crates/ra_syntax/src/syntax_kinds/generated.rs.tera | |||
@@ -75,4 +75,3 @@ impl SyntaxKind { | |||
75 | Some(tok) | 75 | Some(tok) |
76 | } | 76 | } |
77 | } | 77 | } |
78 | |||
diff --git a/crates/ra_syntax/src/validation/mod.rs b/crates/ra_syntax/src/validation.rs index bdee8120c..bdee8120c 100644 --- a/crates/ra_syntax/src/validation/mod.rs +++ b/crates/ra_syntax/src/validation.rs | |||
diff --git a/crates/ra_syntax/src/yellow/mod.rs b/crates/ra_syntax/src/yellow.rs index cacd89dc8..cacd89dc8 100644 --- a/crates/ra_syntax/src/yellow/mod.rs +++ b/crates/ra_syntax/src/yellow.rs | |||