sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure :: is treated as a single token in Rust

pull/25/head
Wilfred Hughes 2021-07-07 22:02:20 +07:00
parent da8a4c1ee1
commit c43e724caf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
Unescape Escape View File

@ -3,9 +3,9 @@
Diffs are now displayed with unchanged lines aligned to the other side. Diffs are now displayed with unchanged lines aligned to the other side.
Improved Rust parsing to recognise lifetime syntax `'foo`, character Improved Rust parsing to recognise lifetime syntax `'foo`, character
literals `'x'` and sequences of punctuation. literals `'x'` and punctuation.
Improve punctuation parsing for OCaml and JS. Improved punctuation parsing for OCaml and JS.
Fixed an issue where the diff calculated may not be minimal. Fixed an issue where the diff calculated may not be minimal.

4
config/syntax.toml
Unescape Escape View File

@ -156,7 +156,9 @@ atom_patterns = [
"'[a-z_]+", "'[a-z_]+",
# Symbols (e.g. variable names) # Symbols (e.g. variable names)
'[a-zA-Z0-9_]+!?', '[a-zA-Z0-9_]+!?',
# Operators # Two character operators
'(::|&&|\|\|)',
# Single character operators
# | is a delimiter for lambdas, but also used in pattern matching. # | is a delimiter for lambdas, but also used in pattern matching.
'[.&=<>/*+:;,|#!?-]', '[.&=<>/*+:;,|#!?-]',
] ]