diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:11:50 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:11:50 +0100 |
| commit | 0d1d548032420c0e7daccfe14bc2fed18775d797 (patch) | |
| tree | 418f42b2f9e7242796211fb11f34e68649b585d6 /src/tokenizer.rs | |
| parent | 12b2c5a161a2922ec86ef003e626ffb78b8f60ed (diff) | |
| download | sylt-0d1d548032420c0e7daccfe14bc2fed18775d797.tar.gz | |
tokenize and report git conflict markers
Diffstat (limited to 'src/tokenizer.rs')
| -rw-r--r-- | src/tokenizer.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tokenizer.rs b/src/tokenizer.rs index b54e194..2c8e5e8 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -127,6 +127,11 @@ pub enum Token { #[token("\n")] Newline, + #[token("<<<<<<<")] + GitConflictBegin, + #[token(">>>>>>>")] + GitConflictEnd, + #[regex(r"//[^\n]*", logos::skip)] Comment, |