diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:37:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 18:37:43 +0100 |
| commit | a9d943e2d93be0e741874cb1ef85488dacc6eeab (patch) | |
| tree | e6591f07da1455d170d5c20c1f49beeeefcd5bbd /src/tokenizer.rs | |
| parent | 02bb836d9a9261b0ba9eb5ef6a9f02cc3605b672 (diff) | |
| parent | 7b2dd8497967bb2a78f7ff2055a4976a9bb2a4e5 (diff) | |
| download | sylt-a9d943e2d93be0e741874cb1ef85488dacc6eeab.tar.gz | |
Merge pull request #87 from FredTheDino/conflict-markers
Detect 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, |