a structural diff that understands syntax 🟥🟩
 
 
 
 
 
Go to file
Wilfred Hughes 918b6a1ba3 Don't consider Hack files with <?hh headers and .php extension as PHP 2022-03-10 00:03:57 +07:00
.github/workflows Bump rust version used to build docs 2022-03-05 11:04:19 +07:00
img
manual Adding support for PHP 2022-03-09 23:52:31 +07:00
sample_files < and > are delimiters in Rust and C++ 2022-03-08 20:42:57 +07:00
scripts Add a helper script for doing releases 2022-01-30 18:04:03 +07:00
src Don't consider Hack files with <?hh headers and .php extension as PHP 2022-03-10 00:03:57 +07:00
vendor Add symlinks for building PHP parser 2022-03-09 23:55:18 +07:00
.codecov.yml
.gitattributes
.gitignore Ignore temporary file from comparison tool 2022-02-13 17:16:30 +07:00
CHANGELOG.md Adding support for PHP 2022-03-09 23:52:31 +07:00
CITATION.cff
Cargo.lock Version bump tree-sitter 2022-03-05 11:03:28 +07:00
Cargo.toml Version bump tree-sitter 2022-03-05 11:03:28 +07:00
LICENSE Roll year 2022-02-05 15:58:45 +07:00
README.md Adding support for PHP 2022-03-09 23:52:31 +07:00
build.rs Adding support for PHP 2022-03-09 23:52:31 +07:00
text_diff_notes.md

README.md

it's difftastic!
manual crates.io codecov.io

Difftastic is an experimental diff tool that compares files based on their syntax.

See the manual to get started.

Demo 1: Wrapping Expressions

Difftastic understands expression nesting. If you wrap an expression in an if statement, difftastic understands that the inner values are unchanged.

Elisp screenshot

Compare this with git's default diff. It is confused by indentation changes, and doesn't know which closing parenthesis has been added.

Elisp comparison screenshot

Demo 2: Reflowing Code

Difftastic is robust to code formatting changes. If you change how many items appear on a single line, difftastic will only show you items which have changed.

Rust screenshot

In git's default diff, it's harder to see that iter and the curly braces are unchanged. It's also harder to see the affected line numbers.

Rust comparison screenshot

Languages

Difftastic supports the following languages:

  • Bash
  • C
  • C++
  • C#
  • Clojure
  • Common Lisp
  • CSS
  • Elixir
  • Emacs Lisp
  • Go
  • Haskell
  • Java
  • JavaScript (and JSX)
  • JSON
  • OCaml
  • PHP
  • Python
  • Ruby
  • Rust
  • Scala
  • TypeScript (and TSX)

If a file has an unrecognised extension, difftastic uses a line-oriented diff.

Known Issues

Performance. Difftastic scales relatively poorly on files with a large number of changes, and can use a lot of memory.

Display. Difftastic has a side-by-side display which usually works well, but can be confusing.

Robustness. Difftastic regularly has releases that fix crashes.

Non-goals

Patch files. If you want to create a patch that you can later apply, use diff. Difftastic ignores whitespace, so its output is lossy. (AST patching is also a hard problem.)

License

Difftastic is open source under the MIT license, see LICENSE for more details.

Files in sample_files/ are also under the MIT license unless stated otherwise in their header.