Support ignoring whitespace in diffs#160
Merged
Merged
Conversation
Member
|
Thank you! 💜 |
ericmj
added a commit
to paulo-valim/diff
that referenced
this pull request
May 15, 2026
The branch was rebased over hexpm#160 ("Support ignoring whitespace in diffs") which added the diff_options/ignore_whitespace? helpers and the whitespace_toggle_label/whitespace_toggle_url view helpers. Wire the toggle into the new Tailwind stats header so ?w=1 retains the visible UI it had on the legacy template. The pluralize/3 helper turns the singular case (1 file) into "file", so test assertions for "files changed" can't match for total=1. Loosen the matcher to "changed" and switch the lingering :timer.sleep spot to assert_eventually.
ericmj
added a commit
that referenced
this pull request
May 18, 2026
* wip
* small ui fixes
* esbuild, fixing tests, fixing diff contrast
* addressing feedbacks
* adding esbuild with mix
* fix contrast
* icon fix
* hosting fonts for privacy
* Address review feedback
- Restore Plausible plausible.init({endpoint}) inline script
- Fix Tailwind v4 placeholder utility (placeholder:text-grey-300)
- Use grey-200 instead of slate-200 in footer social link
- Render copyright year dynamically
- Live-reload also watches lib/diff_web/components/
* Restore whitespace toggle in redesigned diff header
The branch was rebased over #160 ("Support ignoring whitespace in
diffs") which added the diff_options/ignore_whitespace? helpers and
the whitespace_toggle_label/whitespace_toggle_url view helpers. Wire
the toggle into the new Tailwind stats header so ?w=1 retains the
visible UI it had on the legacy template.
The pluralize/3 helper turns the singular case (1 file) into "file",
so test assertions for "files changed" can't match for total=1.
Loosen the matcher to "changed" and switch the lingering :timer.sleep
spot to assert_eventually.
* Copy lib before assets.deploy so Tailwind sees templates
Tailwind v4 in assets/css/app.css declares @source "../../lib" to scan
HEEx templates for class usage. The previous order ran mix assets.deploy
before COPY lib lib, so Tailwind produced a stylesheet missing nearly
all template classes — visible as broken styling on diff.staging.hex.pm.
preview/Dockerfile already copies lib first; mirror that here.
* Bold only "hex" in the wordmark
The header and footer wordmarks rendered the full "hexdiff" string in
bold. Move font-bold to just the "hex" prefix so the brand half pops
and the product name renders in normal weight.
* Highlight diff hunks with Makeup
Wire in the same Makeup stack used by hexpm (makeup 1.2, makeup_elixir,
makeup_erlang, makeup_gleam, makeup_syntect) and run each diff line
through Makeup.highlight_inner_html/2. The lexer is picked once per
file via Makeup.Registry.fetch_lexer_by_extension/1, with the special
cases for rebar.config / *.app.src that match hexpm/preview.
Bundle hexpm's GitHub Dark makeup.css verbatim and neutralize its
wrapper rules on .ghd-text-user.highlight so only the token color
classes apply — diff line layout and add/remove backgrounds are kept.
* Add GitHub Light variant to Makeup theme
The bundled theme was hexpm's GitHub Dark colors (designed for hexpm's
forced dark .highlight background). On diff pages the .highlight
wrapper is transparent so add/remove line backgrounds show through,
which left light-mode users staring at #a5d6ff strings on white. Add
GitHub Light token colors as the default and gate the dark palette
behind [data-theme=dark].
---------
Co-authored-by: Paulo Valim <valim@paulos-mbp.lan>
Co-authored-by: Eric Meadows-Jönsson <eric.meadows.jonsson@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
?w=1support to generate diffs withgit diff -w.Tests
mix testCloses #100