mirror of https://github.com/Wilfred/difftastic/
701 lines
18 KiB
HTML
701 lines
18 KiB
HTML
<!DOCTYPE html>
|
|
<html lang="en" data-bs-theme="dark">
|
|
<head>
|
|
<meta charset="utf-8" />
|
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
<title>Difftastic, a structural diff</title>
|
|
<meta name="description" content="" />
|
|
|
|
<meta property="og:title" content="" />
|
|
<meta property="og:type" content="" />
|
|
<meta property="og:url" content="" />
|
|
<meta property="og:image" content="" />
|
|
|
|
<link
|
|
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
|
|
rel="stylesheet"
|
|
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
|
|
crossorigin="anonymous"
|
|
/>
|
|
<link
|
|
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css"
|
|
rel="stylesheet"
|
|
/>
|
|
|
|
<style>
|
|
body {
|
|
--bs-body-font-size: 18px;
|
|
--bs-border-radius: 0.5rem;
|
|
}
|
|
|
|
h1 {
|
|
font-family: "Fontdiner Swanky", serif;
|
|
text-shadow: 5px 5px #1d1b22;
|
|
}
|
|
|
|
.container h2 {
|
|
padding-bottom: 1rem;
|
|
}
|
|
|
|
html,
|
|
body {
|
|
background-color: #2e3436;
|
|
}
|
|
|
|
object {
|
|
background-color: #f8f8f2;
|
|
border-radius: 25% 25%;
|
|
padding: 5px;
|
|
}
|
|
|
|
/* Colours from https://spec.draculatheme.com/#sec-Color-Palette */
|
|
.white {
|
|
color: #f8f8f2;
|
|
}
|
|
.red {
|
|
color: #ef2929;
|
|
}
|
|
.green,
|
|
a {
|
|
color: #8ae234;
|
|
}
|
|
|
|
.img-wrapper {
|
|
width: atuo;
|
|
border: var(--bs-card-border-width) solid var(--bs-card-border-color);
|
|
border-radius: var(--bs-border-radius);
|
|
background-color: #2e3436;
|
|
}
|
|
.img-wrapper img {
|
|
max-width: 100%;
|
|
}
|
|
|
|
object {
|
|
box-shadow: 5px 5px #a09fa2;
|
|
}
|
|
|
|
img.screenshot {
|
|
box-shadow: none;
|
|
}
|
|
|
|
code {
|
|
color: #ff5555;
|
|
}
|
|
|
|
h3 {
|
|
line-height: 45px;
|
|
}
|
|
|
|
@media only screen and (min-width: 900px) {
|
|
.screenshot {
|
|
max-width: 800px;
|
|
}
|
|
}
|
|
</style>
|
|
</head>
|
|
|
|
<!-- simple project description website, in the style of
|
|
https://popper.js.org/ or
|
|
https://cdnjs.com/libraries/font-awesome TODO: Prefer a dark
|
|
theme. It feels more like code, and less like vanilla
|
|
boostrap. -->
|
|
|
|
<body>
|
|
<div class="px-4 pt-5 text-center">
|
|
<h1 class="display-2 text-body-emphasis">
|
|
<span class="red">diff</span><span class="green">tastic</span>
|
|
</h1>
|
|
|
|
<div class="col-lg-6 mx-auto">
|
|
<h2 class="fs-4 lead">
|
|
a structural diff tool that understands syntax
|
|
</h2>
|
|
<div class="d-grid gap-2 d-sm-flex justify-content-sm-center mb-5">
|
|
<a
|
|
class="btn btn-lg btn-light"
|
|
href="https://github.com/Wilfred/difftastic"
|
|
role="button"
|
|
>GitHub</a
|
|
>
|
|
<a
|
|
class="btn btn-lg btn-light"
|
|
href="https://difftastic.wilfred.me.uk/introduction.html"
|
|
role="button"
|
|
>Manual</a
|
|
>
|
|
<a
|
|
class="btn btn-lg btn-light"
|
|
href="https://difftastic.wilfred.me.uk/installation.html"
|
|
role="button"
|
|
>Install</a
|
|
>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="container col-xxl-8 px-4">
|
|
<div class="container px-4">
|
|
<p class="px-5">
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
|
|
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
|
|
minim veniam, quis nostrud exercitation.
|
|
</p>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
Focus On
|
|
<span class="green">What Changed</span>
|
|
</h2>
|
|
|
|
<div class="img-wrapper mb-4">
|
|
<img src="add_wrap.png" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
Difftastic parses your code with tree-sitter. Unlike a line-oriented
|
|
text diff, difftastic understands that the inner expression hasn't
|
|
changed here.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
<span class="green">Ignore</span> Formatting Changes
|
|
</h2>
|
|
|
|
<div class="img-wrapper mb-4">
|
|
<img src="reformat.png" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
Has your code formatter decided to split something over multiple
|
|
lines? Difftastic can show what has actually changed.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
<span class="green">Understand</span> Wrapping Changes
|
|
</h2>
|
|
|
|
<div class="img-wrapper mb-4">
|
|
<img src="wrap_struct.png" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
Have you added a wrapper? Difftastic can match the delimiters
|
|
exactly.
|
|
</p>
|
|
|
|
<div class="img-wrapper mb-4">
|
|
<img src="change_wrap.png" class="mb-4" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
Even if you change the inner content, difftastic can still show you
|
|
the additional wrapper.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
<span class="green">Real</span>
|
|
Line Numbers
|
|
</h2>
|
|
|
|
<div class="img-wrapper mb-4">
|
|
<img src="line_numbers.png" class="mb-4" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
Do you know how to read
|
|
<code>@@ -5,6 +5,7 @@</code> syntax? Difftastic shows the actual
|
|
line numbers from your files, both before and after.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5 my-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
60 Second <span class="green">Demo</span>
|
|
</h2>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- https://devicon.dev/ provides SVG logos. -->
|
|
<div class="card px-2 pt-2 mx-5 mt-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">Programming Languages</h2>
|
|
|
|
<div
|
|
class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 g-4 pb-4"
|
|
>
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="cplusplus.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
C++
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="csharp.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
C#
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="clojure.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Clojure
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="dart.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Dart
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="erlang.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Erlang
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="go.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Go
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="haskell.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Haskell
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="java.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Java
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="javascript.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
JavaScript
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="kotlin.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Kotlin
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="lisp.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Lisp
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="lua.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Lua
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="ocaml.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
OCaml
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="php.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
PHP
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="python.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Python
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="r.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
R
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="ruby.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Ruby
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="rust.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Rust
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="scala.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
Scala
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="typescript.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
TypeScript
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- end languages -->
|
|
</div>
|
|
|
|
<p>
|
|
And more! See the full
|
|
<a href="https://difftastic.wilfred.me.uk/languages_supported.html"
|
|
>list of supported languages</a
|
|
>
|
|
in the manual.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">File Formats</h2>
|
|
|
|
<div
|
|
class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 g-4 pb-4"
|
|
>
|
|
<div class="col d-flex align-items-start">
|
|
<!-- https://www.svgrepo.com/svg/371192/curly-brackets -->
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="braces.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
HCL
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="html5.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
HTML
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="json.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
JSON
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col d-flex align-items-start">
|
|
<object
|
|
class="me-3"
|
|
width="45px"
|
|
height="45px"
|
|
data="yaml.svg"
|
|
type="image/svg+xml"
|
|
></object>
|
|
|
|
<div>
|
|
<h3 class="fw-bold mb-0 fs-4">
|
|
YAML
|
|
</h3>
|
|
</div>
|
|
</div>
|
|
<!-- end formats -->
|
|
</div>
|
|
|
|
<p>
|
|
And even more! See the full
|
|
<a
|
|
href="https://difftastic.wilfred.me.uk/languages_supported.html#structured-text-formats"
|
|
>list of supported file formats</a
|
|
>
|
|
in the manual.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5 mt-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
Works With <span class="green">Git</span>
|
|
</h2>
|
|
<div class="img-wrapper mb-4">
|
|
<img src="git_difftool.png" alt="screenshot" />
|
|
</div>
|
|
<p>
|
|
See the
|
|
<a href="https://difftastic.wilfred.me.uk/git.html"
|
|
>git configuration instructions</a
|
|
>
|
|
in the manual.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card px-2 pt-2 mx-5 mt-5">
|
|
<div class="card-body">
|
|
<h2 class="card-heading">
|
|
Fully <span class="green">Open Source</span>
|
|
</h2>
|
|
<p>
|
|
Difftastic is
|
|
<a href="https://github.com/Wilfred/difftastic/blob/master/LICENSE"
|
|
>MIT licensed</a
|
|
>. Download it, modify it, share it with your friends!
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="container px-4 mt-5">
|
|
<p class="px-5">
|
|
<em
|
|
>Made with Emacs and coffee by
|
|
<a href="https://github.com/wilfred/">Wilfred Hughes</a>.</em
|
|
>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
<link
|
|
rel="stylesheet"
|
|
href="https://fonts.googleapis.com/css?family=Fontdiner+Swanky"
|
|
/>
|
|
</body>
|
|
</html>
|