sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,513 Commits
43 Branches
77 Tags
1.9 GiB
Commit Graph

15513 Commits (6aa5eb2d24a5cb1812df99a28d291df6de35a495)
 

Author SHA1 Message Date
Wilfred Hughes 79bdf87c97 Remove old vendored haskell parser 2024-12-19 22:41:54 +07:00
Wilfred Hughes bbe4890cfd Use tree-sitter-haskell from crates.io 2024-12-19 22:33:28 +07:00
Wilfred Hughes 943ea4b613 Bump tree-sitter to 0.24.x 2024-12-19 22:22:12 +07:00
Wilfred Hughes 527b701593 Bump tree-sitter and install tree-sitter-language 2024-12-19 21:57:47 +07:00
Wilfred Hughes 649c557708 Fix some clippy lints 2024-12-19 21:29:31 +07:00
Wilfred Hughes f68948ffeb Increase MSRV to 1.74.1 
This will enable usage of the new tree-sitter-language crate.
 2024-12-19 21:25:00 +07:00
Wilfred Hughes a1603dea4b Switch to tree-sitter 0.22 2024-12-19 21:11:55 +07:00
Wilfred Hughes 0ca2c594a3 Accept the hightlighting changes 
elvish: less highlighted as bold, seems like a small regression

hcl: not highlighting variables in bold now, a small regression

smali: more stuff in bold overall, but no longer the method name in bold
 2024-12-19 21:11:55 +07:00
Wilfred Hughes 44d3f19222 Disable SCSS highlights highlights which don't work in 0.21 2024-12-19 21:11:55 +07:00
Wilfred Hughes 831cd1e522 bump tree-sitter version 2024-12-19 21:11:55 +07:00
Wilfred Hughes 5c29f90bc0 Fix deprecated clap actions 2024-12-15 14:52:46 +07:00
Wilfred Hughes c59300c463 Fix some clap deprecated API usage 2024-12-15 14:47:07 +07:00
Wilfred Hughes 3ed255ac8f Set actions to prepare for clap4 migration 2024-12-15 14:29:36 +07:00
Wilfred Hughes 9a8889dc4b Remove call that had no side effect 2024-11-26 01:43:03 +07:00
Wilfred Hughes 45e5cd8157 Mention mergiraf 2024-11-26 01:41:46 +07:00
Gears 066704e482 Generate parser 2024-11-26 00:35:28 +07:00
Gears e451746f71
Add support for `let assert ... as` (#107) 2024-11-25 18:34:56 +07:00
Wilfred Hughes 00f6959a29 Ensure JSON output is consistently ordered 
Closes #780
 2024-11-15 23:17:27 +07:00
Wilfred Hughes 3a1e398edc Improve handling of named pipe arguments 
Use display_name in more places, and prefer file names with extensions
when we have two arguments.

Fixes #783
 2024-11-15 23:11:25 +07:00
Wilfred Hughes 956b09a63e Remove another mention of old flag name 2024-11-15 22:54:58 +07:00
Wilfred Hughes 430db0efc5 Update options parsing for new flag spelling 2024-11-15 22:51:48 +07:00
Wilfred Hughes 39e645832e Fix compilation on older Rust versions 2024-11-15 22:08:15 +07:00
Wilfred Hughes 90f108105d The syntax is dot, not dotty 2024-11-15 22:04:07 +07:00
Wilfred Hughes 13b8252d8b Fix typo 2024-11-14 23:41:35 +07:00
Wilfred Hughes d5b1e26d70 Add a debug helper for syntax tree as DOT 2024-11-14 22:55:00 +07:00
Wilfred Hughes 4df51dc57c Improve syntax highlighting on tree-sitter lists that are just keywords 
Closes #777
 2024-11-15 00:03:30 +07:00
Wilfred Hughes 819a672df8 Clarify content ID in debug output on Syntax 2024-11-15 00:03:30 +07:00
Wilfred Hughes 1c0dd04ef1 Allow debug printing of HighlightedNodeIds 2024-11-15 00:03:30 +07:00
Wilfred Hughes 549cb483fe Fix crash due to trailing newlines in string nodes at EOF 
Fixes #782
 2024-11-15 00:03:30 +07:00
dependabot[bot] 7b06f6ed39
Bump tree-sitter/setup-action from 1 to 2 (#179) 2024-11-11 18:56:52 +07:00
dependabot[bot] 45fe67712c
Bump node-addon-api from 8.2.0 to 8.2.2 (#180) 2024-11-11 18:56:43 +07:00
dependabot[bot] 42c550e940
Bump tree-sitter-cli from 0.24.1 to 0.24.4 (#181) 2024-11-11 18:56:34 +07:00
Giacomo Cavalieri 2702fe84b9 Generate parser 2024-10-30 19:13:15 +07:00
Giacomo Cavalieri 17590082db add precedence tests 2024-10-30 19:12:59 +07:00
Giacomo Cavalieri 6b2707d97c Fix highlighting bug 
Thank you so much to @endofunky!!

Co-authored-by: @endofunky
 2024-10-30 19:12:59 +07:00
Giacomo Cavalieri 8db8a0ba8b add echo 2024-10-30 19:12:59 +07:00
Jan Klass 0412e13fcc docs(contributing): Add mdbook install note about toolchain 
The difftastic `Cargo.toml` currently specifies Rust version 1.66 to be used.

When running `cargo install mdbook` in the repository directory or manual sub-directory, the installation fails.

With a more recent Rust toolchain active, which can reasonably be assumed outside of the repository directory, the mdbook installation works fine.

If the user does not have a more recent toolchain active outside of the directory, the note at least serves as a pointer to the issue.

---

The error in question:

```
error: failed to compile `mdbook v0.4.40`, intermediate artifacts can be found at `[…]\Temp\cargo-install[…]`

Caused by:
  failed to select a version for `env_logger`.
      ... required by package `mdbook v0.4.40`
  versions that meet the requirements `^0.11.1` are: 0.11.5, 0.11.4, 0.11.3, 0.11.2, 0.11.1

  the package `mdbook` depends on `env_logger`, with features: `anstream` but `env_logger` does not have these features.
   It has an optional dependency with that name, but that dependency uses the "dep:" syntax in the features table, so it does not have an implicit feature with that name.

  failed to select a version for `env_logger` which could resolve this conflict
```
 2024-10-30 07:45:02 +07:00
Jan Klass a01efbf5f2 docs(install): Improve latest release wording 2024-10-26 13:38:24 +07:00
Jan Klass f299fa1157 docs(install): Add winget install instruction 
The 'difftastic' is not linked like in the other sections because winget does not have a package-frontend website. We could link to the package source [pkgsrc], but that seems inappropriate for end-users.

[pkgsrc]: https://github.com/microsoft/winget-pkgs/tree/master/manifests/w/Wilfred/difftastic
 2024-10-26 13:38:24 +07:00
Jan Klass 0b3b187d02 docs(install): Improve Installation docs 
* Introduce OS sections
* Introduce general intro text
* Highlight differentiators (OS and package managers)
* Use consistent source code spacing
 2024-10-26 13:38:24 +07:00
Wilfred Hughes c2e98bb65a Roll version 2024-10-24 08:17:18 +07:00
Wilfred Hughes 870d1411a0 Link to relevant page in manual 2024-10-23 22:27:01 +07:00
Wilfred Hughes 05378e4554 Silence a clippy lint 2024-10-23 08:51:13 +07:00
Wilfred Hughes 6a5f5d6f00 Document side-by-side changes 2024-10-23 08:47:28 +07:00
Wilfred Hughes 618d8dd8ad Distinguish version and short version metadata to make --help clearer 
Fixes #774
 2024-10-23 08:44:28 +07:00
Wilfred Hughes c396bb0102 Note on ASCII assumptions in content_max_width 2024-10-21 22:57:01 +07:00
Wilfred Hughes 511b7579fb Fix min() which should be max() 2024-10-21 22:53:28 +07:00
Wilfred Hughes 845bbeafff Cap the maxmimum size of columns in side-by-side display 2024-10-21 09:04:29 +07:00
Wilfred Hughes 8b2b94a458 Clarify name 2024-10-21 08:39:03 +07:00
Wilfred Hughes 8cdb59fa5e Normalise newlines before diffing 
This produces good, consistent results on different trailing newlines
before, consistent with the behaviour before 7edd2a82cd (see #755).
 2024-10-21 08:34:39 +07:00