Repair --default-language, and highlight using full filename #1549

th1000s · 2023-10-03T13:43:11Z

Repair --default-language, and highlight using full filename

Fixed that the "txt" fallback was used instead of --default-language

And when looking for syntax highlighting, keep the filename around
as long as possible.

Using simple custom logic (filename > 4) a Makefile can be highlight with
make syntax, but a cc or ini file does not get treated like a .cc or .ini file.

Currently the underlying highlighting lib syntect and the sublime syntex
definitions can not make this distinction
(http://www.sublimetext.com/docs/syntax.html).

Plus clippy warnings

th1000s · 2023-10-03T13:47:26Z

The filename cutoff is 4, not 3 (from actual DOS 8.3 filenames) because of newer extensions like .toml and .flac. And I could not think of file formats without extensions which are just 4 short and have a meaning by itself, like Makefile. Maybe this could even be extended to 5.

This should fix #1513

src/handlers/diff_header.rs

src/handlers/grep.rs

src/handlers/diff_header.rs

dandavison

Thanks @th1000s! Just that one question about the code comment in the test: in what sense is Makefile etc not handled.

tbm · 2023-11-27T02:25:52Z

@th1000s I just saw you submitted a PR for an issue I reported. Thank you! do you by any chance to incorporate the feedback comments from @dandavison ? I'd love to see your fix applied. Thanks!

Fixed that the "txt" fallback was used instead of --default-language And when looking for syntax highlighting, keep the filename around as long as possible. Using simple custom logic (filename > 4) a Makefile can be highlighted with make syntax, but a 'cc' or 'ini' file does not get treated like a *.cc or *.ini file. Currently the underlying highlighting lib syntect and the sublime syntax definitions can not make this distinction (<http://www.sublimetext.com/docs/syntax.html>).

dandavison · 2024-05-04T13:45:07Z

Thanks @th1000s!

(The MacOS build failure occurs on main; I am not sure why yet)

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://github.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](dandavison/delta@0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@th1000s](https://github.com/th1000s) has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below! #### What's Changed - Link to Repository from Manual by [@bash](https://github.com/bash) in dandavison/delta#1657 - Stop highlighting unchanged whitespace by [@phillipwood](https://github.com/phillipwood) in dandavison/delta#1659 - Add .gitattributes rules for rust files by [@phillipwood](https://github.com/phillipwood) in dandavison/delta#1245 - Repair --default-language, and highlight using full filename by [@th1000s](https://github.com/th1000s) in dandavison/delta#1549 - tests: prevent parallel env var access by [@th1000s](https://github.com/th1000s) in dandavison/delta#1681 - CI: fix macOS build by [@th1000s](https://github.com/th1000s) in dandavison/delta#1696 - Only use `nosort` in bash <4.4 by [@martinml](https://github.com/martinml) in dandavison/delta#1683 - Don't read git files when --no-gitconfig is given + unused variables by [@th1000s](https://github.com/th1000s) in dandavison/delta#1728 - tests: add insta for snapshot testing by [@th1000s](https://github.com/th1000s) in dandavison/delta#1739 - tests: set terminal width to 43 by [@th1000s](https://github.com/th1000s) in dandavison/delta#1741 - Fix panic when blame-palette is empty by [@thorio](https://github.com/thorio) in dandavison/delta#1737 - Make relative-paths work with binary files by [@th1000s](https://github.com/th1000s) in dandavison/delta#1740 - Fix github links from master to main by [@madeddie](https://github.com/madeddie) in dandavison/delta#1709 - Update `terminal-colorsaurus` by [@bash](https://github.com/bash) in dandavison/delta#1699 - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@th1000s](https://github.com/th1000s) in dandavison/delta#1762 - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@injust](https://github.com/injust) in dandavison/delta#1745 - deps: bump libc from 0.2.153 to 0.2.155 by [@wxpppp](https://github.com/wxpppp) in dandavison/delta#1715 - Add missing `--file-*-label` option to `--navigate` docs by [@injust](https://github.com/injust) in dandavison/delta#1744 - Fix copy-paste typo by [@injust](https://github.com/injust) in dandavison/delta#1767 - Update syntect to 5.2.0 by [@timhillgit](https://github.com/timhillgit) in dandavison/delta#1672 - Disable light mode detection in tests by [@bash](https://github.com/bash) in dandavison/delta#1765 - Add --max-syntax-highlighting-length, set to 400 by [@th1000s](https://github.com/th1000s) in dandavison/delta#1746 - chore: cleanup brew formula file in favor of core tap by [@chenrui333](https://github.com/chenrui333) in dandavison/delta#1773 - wrap --help output, fix rust 1.80 build by [@th1000s](https://github.com/th1000s) in dandavison/delta#1440 - Fix delta-toggle shell script by [@dandavison](https://github.com/dandavison) in dandavison/delta#1794 - Do not wrap short help (-h) output by [@th1000s](https://github.com/th1000s) in dandavison/delta#1800 - Implement --diff-args by [@dandavison](https://github.com/dandavison) in dandavison/delta#1697 - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@th1000s](https://github.com/th1000s) in dandavison/delta#1787 - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@th1000s](https://github.com/th1000s) in dandavison/delta#1805 #### New Contributors - [@martinml](https://github.com/martinml) made their first contribution in dandavison/delta#1683 - [@thorio](https://github.com/thorio) made their first contribution in dandavison/delta#1737 - [@madeddie](https://github.com/madeddie) made their first contribution in dandavison/delta#1709 - [@injust](https://github.com/injust) made their first contribution in dandavison/delta#1745 - [@wxpppp](https://github.com/wxpppp) made their first contribution in dandavison/delta#1715 - [@timhillgit](https://github.com/timhillgit) made their first contribution in dandavison/delta#1672 - [@chenrui333](https://github.com/chenrui333) made their first contribution in dandavison/delta#1773 **Full Changelog**: dandavison/delta@0.17.0...0.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

dandavison reviewed Nov 18, 2023

View reviewed changes

src/handlers/diff_header.rs Outdated Show resolved Hide resolved

dandavison reviewed Nov 18, 2023

View reviewed changes

src/handlers/grep.rs Outdated Show resolved Hide resolved

dandavison reviewed Nov 18, 2023

View reviewed changes

src/handlers/diff_header.rs Outdated Show resolved Hide resolved

dandavison requested changes Nov 18, 2023

View reviewed changes

Fix clippy warnings

59d747f

th1000s force-pushed the def_lang branch from 40202ac to ff95ad5 Compare May 1, 2024 13:38

th1000s force-pushed the def_lang branch from ff95ad5 to 6abb63e Compare May 1, 2024 13:44

dandavison merged commit 3b953da into dandavison:main May 4, 2024
9 of 12 checks passed

th1000s mentioned this pull request Jul 16, 2024

🐛 rg --json | delta output has different colour depending on filename ("ini") #1513

Closed

BrewTestBot mentioned this pull request Aug 16, 2024

git-delta 0.18.0 Homebrew/homebrew-core#181387

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Repair --default-language, and highlight using full filename #1549

Repair --default-language, and highlight using full filename #1549

th1000s commented Oct 3, 2023

th1000s commented Oct 3, 2023

dandavison left a comment

tbm commented Nov 27, 2023

dandavison commented May 4, 2024

Repair --default-language, and highlight using full filename #1549

Repair --default-language, and highlight using full filename #1549

Conversation

th1000s commented Oct 3, 2023

th1000s commented Oct 3, 2023

dandavison left a comment

Choose a reason for hiding this comment

tbm commented Nov 27, 2023

dandavison commented May 4, 2024