difftastic VS navi

i want a diff tool that shows me exactly which tokens have changed, and which haven't, regardless of how they are laid out.

These already exist: https://github.com/Wilfred/difftastic

when we get that, then we should get even less merge conflicts.

Counterintuitively, that is not the case. AST-merge is a much, much, much, much, much harder problem than AST-diff.

https://github.com/Wilfred/difftastic?tab=readme-ov-file#can...

The fact that diffs can be used to drive a 3-way merge is in fact an accidental property that arises due to the sheer crudeness of the diff format. As soon as you start using more-sophisticated diff formats, solutions to "the diff problem" no longer lead directly to solutions to "the merge problem".

Yes there is an `—-override` option you can use to specify the language in which a file should be parsed.

https://github.com/Wilfred/difftastic/blob/master/CHANGELOG....

Use the fantastic difftastic instead of git's diff. https://difftastic.wilfred.me.uk/

  [alias]

difftastic provides similar capabilities in a free tool based on treesitter

difftastic? https://github.com/Wilfred/difftastic

If you're looking for a VS Code extension or a GitHub app, check out https://semanticdiff.com/. I'm a co-founder of this project.

If you prefer a CLI tool, check out https://github.com/Wilfred/difftastic. It supports more languages, but doesn't recognize when code has been replaced by an equivalent version ("invariances"). So it will show some changes (e.g. replacing a character in a string with an escape sequence) even though they are technically equivalent.

Shameless plug: I've written difftastic[1], a tool that builds ASTs and then does a structural diff of them. You can use it with git too.

It's an incredibly hard problem though, both from a computational complexity point of view, and trying to build a comprehensible UI once you've done the structural AST diff.

[1]: https://github.com/wilfred/difftastic

There is a diff tool called difftastic: https://github.com/Wilfred/difftastic

The idea is that it does not show diff based on text change, but on syntastic meaning. For that, it uses tree-sitter.

I think it still shows the trailing comma in the situation as shown in the article, but it's quite different experience than the standard text based diff.

I've built something similar for myself (fzf+a bit of shell). But I realized that fzf's history view (with very long history buffer) works much better for my use case.

I still needed something to cover rare commands with dynamic arguments. That got covered by Navi: https://github.com/denisidoro/navi (takes more friction to add new command than with TBMK, but you get much more organized and easier to search tool).

navi repo add denisidoro/navi-tldr-pages Cloning https://github.com/denisidoro/navi-tldr-pages into /home//.local/share/navi/cheats/tmp... Cloning into '/home//.local/share/navi/cheats/tmp'... remote: Enumerating objects: 1841, done. remote: Counting objects: 100% (1841/1841), done. remote: Compressing objects: 100% (1756/1756), done. remote: Total 1841 (delta 83), reused 1839 (delta 83), pack-reused 0 Receiving objects: 100% (1841/1841), 504.71 KiB | 1.95 MiB/s, done. Resolving deltas: 100% (83/83), done. Hey, listen! navi encountered a problem. Do you think this is a bug? File an issue at https://github.com/denisidoro/navi. Caused by: 0: Failed to import cheatsheets from `denisidoro/navi-tldr-pages` 1: Failed to get cheatsheet files from finder 2: Failed to pass data to finder 3: Unable to prompt cheats to import 4: Broken pipe (os error 32)

Similar projects (in a way): navi

I think navi is a better alternative. You can create custom cheats too.

navi might help you with that

I like using navi, but idk if you want something that runs in the terminal.

There's also a cli program called tealdeer that does this kind of thing and uses a local cache. And there's a fuzzy search interactive cli cheatsheet program called navi that's also pretty cool (and you can write your own cheatsheets).