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

10229 Commits (5a09e9b3f7a388a07eb988a070fbbc5d8f5c3077)
 

Author SHA1 Message Date
Wilfred Hughes 28c6e35943 Merge #205 2022-04-02 17:18:59 +07:00
Wilfred Hughes 9606afad46
Merge pull request #218 from Andoryuuta/zig-support 
Add Zig support
 2022-04-02 17:08:13 +07:00
Wilfred Hughes 276be1528c Prefer the upstream cargo-llvm-cov CI step 2022-04-02 16:17:34 +07:00
Wilfred Hughes 1df4971deb Grammar fix in manual 2022-04-02 16:12:13 +07:00
Wilfred Hughes a4ca19f9f9 Pin nightly version due to build failures with more recent versions 
Seeing failures on rustc 1.61.0-nightly (0677edc86 2022-03-31).
 2022-04-02 16:07:41 +07:00
Michael Hoffmann d559c46ba1 deps: bump tree-sitter to 0.20.6 and regenerate parser 2022-04-02 20:07:24 +07:00
José Valim c68c4ad72f
Update README.md 
Closes #32.
 2022-04-02 11:39:21 +07:00
Wilfred Hughes e472acb805 Add a --language option to override language detection 
Fixes #199
 2022-04-01 23:10:48 +07:00
Wilfred Hughes e3d91d6dcc Move header checks out of from_extension 2022-04-01 22:24:12 +07:00
Wilfred Hughes 97b9a13d15 Expose a proper `--display` CLI option 
This helps with discovery of the different display options available,
such as inline (see #34).
 2022-04-01 22:15:24 +07:00
Andrew Gutekanst 7881e4eb10 Merge commit '4cff36421dae9c05388b86cd64d2bab4b9ed6676' into zig-support 2022-04-02 00:29:00 +07:00
maxxnino 4cff36421d
Add MIT license 
fixed #13
 2022-04-02 10:33:48 +07:00
maxxnino 664ebbf264
Merge pull request #12 from gpanders/multiline-string-prefix 
Include leading \\ characters as anonymous nodes
 2022-04-02 10:28:46 +07:00
Gregory Anders 2761ae356c
Include leading \\ characters as anonymous nodes 
Include the leading \\ characters for multiline strings as anonymous
nodes in the parsed tree. This allows highlighters to highlight these
characters separately from the rest of the string.
 2022-04-02 12:24:46 +07:00
Wilfred Hughes e9992a60f4 Clarify the limitations of patch files 
See also #186.
 2022-04-01 09:38:08 +07:00
Wilfred Hughes 16d5d2350d Clarify wording 2022-04-01 09:30:07 +07:00
Wilfred Hughes 1f8b6fe377 Mention the minimum GCC version following #187 2022-04-01 09:24:16 +07:00
Jacob Rothstein 9945270f4b
add gleam 
# Conflicts:
#	CHANGELOG.md
#	README.md
 2022-03-31 14:08:05 +07:00
Jacob Rothstein 04fc2af501 Add 'vendor/tree-sitter-gleam/' from commit 'a1fc486493ce8ad6dc3abf0203c239c2b614811a' 
git-subtree-dir: vendor/tree-sitter-gleam
git-subtree-mainline: bef93e9626
git-subtree-split: a1fc486493
 2022-03-31 13:56:38 +07:00
Wilfred Hughes bef93e9626 Roll version 2022-03-31 09:47:58 +07:00
Andrew Gutekanst 82071d70c1 Merge upstream changes and resolve conflict 2022-03-31 12:42:57 +07:00
Andrew Gutekanst 6c2504a34f Add expected Zig diff results for CI check 2022-03-31 12:38:17 +07:00
Andrew Gutekanst c601e157d6 Cargo fmt 2022-03-31 12:35:21 +07:00
Wilfred Hughes 299c321e72 Treat interpolated strings as atoms in PHP 
This makes diffing slightly less useful for large strings, but it's
consistent with the other languages.
 2022-03-31 09:34:03 +07:00
Wilfred Hughes a1ec5e88e8 Fix side-by-side display when source contains CRLF 
Fixes #212
 2022-03-31 09:32:21 +07:00
Alessandro Manno f0ea7dc44e
Merge branch 'master' into add_yaml_support 
# Conflicts:
#	README.md
 2022-03-31 11:23:15 +07:00
sogaiu bfa6ab18a3 Prevent dropping of symbols after metadata 2022-03-31 16:19:08 +07:00
sogaiu a9b3ea47e6 Add corpus 2022-03-31 16:12:50 +07:00
Wilfred Hughes 8d44b2476a Expand 'Adding a parser' as a separate chapter in the manual 2022-03-30 23:58:50 +07:00
Wilfred Hughes 1593de4208 Remove redundant parentheses 2022-03-30 23:35:44 +07:00
Wilfred Hughes 559d0f9b6b Fix Java delimiters `[` and `]` 2022-03-30 23:23:44 +07:00
Wilfred Hughes c4c05fdde5 Prefer a single language list, in the manual 
It's easy for these to get out of sync.
 2022-03-30 22:50:17 +07:00
Wilfred Hughes e653b77194 Hack is not currently supported 2022-03-30 22:46:40 +07:00
Wilfred Hughes 5703f75568 Don't assume that lines end with newlines 
Previously we would crash if the last line in a file had no trailing
newline and ended with a multibyte character.

Closes #217
 2022-03-30 22:42:17 +07:00
Wilfred Hughes ff37192918 Update changelog for last commit 2022-03-30 20:56:12 +07:00
Dmitry Marakasov 9fc437216c Make --color affect missing line number formatting 
Fixes #213
 2022-03-30 20:55:23 +07:00
Wilfred Hughes ce076a142b Tweak formatting in README 
Half the sentence being bold looks untidy.
 2022-03-30 20:54:37 +07:00
Andrew Gutekanst 6075f70a84 Update documentation to include Zig 2022-03-30 23:39:01 +07:00
Andrew Gutekanst 7f2efa1af9 Add Zig support 2022-03-30 23:32:48 +07:00
Andrew Gutekanst be0afd1696 Add 'vendor/tree-sitter-zig/' from commit '42e93d02ca945094699e2dc4de785bbaf8f740ec' 
git-subtree-dir: vendor/tree-sitter-zig
git-subtree-mainline: d1c25576ba
git-subtree-split: 42e93d02ca
 2022-03-30 23:26:06 +07:00
Alessandro Manno b2dd6c5aa8
fixed compare.expected 2022-03-30 19:36:27 +07:00
Jonathan Arnett a1fc486493
Try (again) to make GitHub's Linguist .gitattributes work (#23) 
Our present Linguist configuration in `.gitattributes` doesn't seem to be having any effect, as can be seen when viewing this commit: 7159ce9615.

Historically we've employed [the style employed by tree-sitter-elixir](60863fc6e2/.gitattributes) ([here](4ef644a352)) to no avail. This new attempt combines usage of [the shorthand from tree-sitter-rust](0509e440ae/.gitattributes) with [the no-leading-slash style from Linguist's own documentation](https://github.com/github/linguist/blob/master/docs/overrides.md#generated-code). Hopefully it works this time 🤞
 2022-03-30 12:27:14 +07:00
Wilfred Hughes d1c25576ba
Merge pull request #206 from mjul/patch-1 
Fix "she-bang" typo
 2022-03-30 09:11:22 +07:00
Alessandro Manno ab1bb48ab3
fixed delimiter_tokens 2022-03-30 12:45:32 +07:00
Alessandro Manno ffddaa645e
Added yaml support 2022-03-30 12:43:01 +07:00
Martin Jul 4747517039
Fix "she-bang" typo 
This makes the test correct in case the full rule of only recognizing an Emacs mode line on the second line if the first line is a "she-bang" line is ever fully implemented.
 2022-03-30 09:57:37 +07:00
Wilfred Hughes 5116c69afe Make installation instructions more prominent 2022-03-29 23:22:33 +07:00
Wilfred Hughes 16ecf15867 Mention prebuilt packages and expand build instructions 
Fixes #202
 2022-03-29 23:20:22 +07:00
Wilfred Hughes 3c84538253 Escape newlines in --dump-ts when the node kind is '\n' 
--dump-ts is only intended as a debugging feature, but it's a little
confusing when newlines aren't escaped.

Fixes #203
 2022-03-29 22:51:38 +07:00
Wilfred Hughes ecdf993ff1 Add support for Nix 
Closes #196
 2022-03-29 22:46:09 +07:00