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

13634 Commits (b9a1302e54588b87bc89db0685eefbd4804f4de3)
 

Author SHA1 Message Date
Wilfred Hughes def88bbb43 Fix spelling in CHANGELOG 2023-08-15 23:01:09 +07:00
Wilfred Hughes a87ca9dd87 Mention merge conflicts in FAQ 2023-08-15 23:00:43 +07:00
Wilfred Hughes 8ac4398c48 Automatically bump version after release 2023-08-15 22:26:28 +07:00
Wilfred Hughes 191f42e9d5 Clippy fixes 2023-08-15 21:42:06 +07:00
Wilfred Hughes 6b1c82efdf Prefer Option<&T> over &Option<T> 2023-08-15 21:37:41 +07:00
Wilfred Hughes a43b9ae9eb Dim the extra information section in hunks 2023-08-15 21:33:11 +07:00
Paa Kojo Samanpa 28fa64492e
fix: use _Static_assert instead of static_assert 
According to https://en.cppreference.com/w/c/language/_Static_assert in C11 one should use _Static_assert on not static_assert with is valid in C++.
 2023-08-16 00:27:18 +07:00
Wilfred Hughes e1f97e614f Improve wording of conflict information 
Fixes #555
 2023-08-15 17:52:02 +07:00
Amaan Qureshi 90d3d64e39 feat: update ci script, add python repo 2023-08-15 19:59:35 +07:00
Amaan Qureshi cca9213823 chore: update tests 2023-08-15 19:59:35 +07:00
Amaan Qureshi 71977ea08c chore: generate 2023-08-15 19:59:35 +07:00
Amaan Qureshi 8f71d9cb98 fix(scanner): don't dedent inside f-strings, skip newlines following a backslash in raw strings 2023-08-15 19:59:35 +07:00
Amaan Qureshi bcbf41589f feat: support Python 3.12 
This adds support for type alias statements and type parameters

fix: some string bugs
 2023-08-15 19:59:35 +07:00
Wilfred Hughes e0a1405453 Add the ability to parse conflict markers and diff the two files 2023-08-15 09:01:15 +07:00
Amaan Qureshi 48fdcfb2d5 chore: update tests 2023-08-14 15:44:17 +07:00
Amaan Qureshi 4ef1cec6fc chore: generate 2023-08-14 15:44:17 +07:00
Amaan Qureshi e0cb646673 feat: move parsing escape_interpolations to the scanner 2023-08-14 15:44:17 +07:00
Rick Winfrey 49b6f1c84a Add module tag query 2023-08-14 13:08:40 +07:00
Wilfred Hughes f06e95ca02 Renamed `old_path` to `extra_info` and format it during option parsing 
This allows us to use this field for other purposes that aren't
renames.
 2023-08-14 08:41:42 +07:00
Wilfred Hughes f1ba399504 Move local variable closer to first use 2023-08-14 08:27:42 +07:00
Wilfred Hughes c6be0bc16a Mention --check-only in the FAQ 2023-08-13 23:08:06 +07:00
Wilfred Hughes eeb2974967 Move option parsing before argument parsing 
This is useful for additional mode parsing that wants to access these
options.
 2023-08-13 21:34:42 +07:00
Wilfred Hughes 1c60f3efd3 Move content detection out of diff_file_content 
This makes the function useful in cases when we already have a string,
not bytes.
 2023-08-13 21:31:37 +07:00
Wilfred Hughes 0af76db498 Update regression tests for humansize file formatting 2023-08-13 09:10:16 +07:00
Wilfred Hughes 3c702d0490 Use humansize for file size formatting 2023-08-12 22:34:11 +07:00
Amaan Qureshi 8077be4c55
Merge pull request #186 from amaanq/fixes 
Fixes
 2023-08-12 15:45:24 +07:00
Wilfred Hughes d901ac6e9e Silence warning on compiling tree-sitter-go 2023-08-12 11:35:48 +07:00
Amaan Qureshi 38c8b0bbfb
chore: update manifests and README 2023-08-12 14:23:26 +07:00
Amaan Qureshi cd7d20f73a
ci: update ci action, add fuzz, lint, and publish actions 2023-08-12 14:23:26 +07:00
Amaan Qureshi 6f7aab758b
feat: add and apply eslint formatting 2023-08-12 14:23:26 +07:00
Amaan Qureshi 9c2c5d9209
chore: move corpus to test/ 2023-08-12 14:23:26 +07:00
Amaan Qureshi fc1cc80acf
chore: generate 2023-08-12 14:23:26 +07:00
Amaan Qureshi 752e98a79a
feat: improve parsing of numbers and C-style for loops 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2023-08-12 14:23:26 +07:00
Amaan Qureshi a7325bd0a0
fix: don't error out on empty assignments followed by a terminator 2023-08-12 13:48:04 +07:00
Amaan Qureshi 91d8161935
fix: immediate `#`s are allowed in a concatenation, as well as variable assignments 2023-08-12 13:48:04 +07:00
Amaan Qureshi a3935656b6
fix: do not scan heredoc ends when it succeeds non-ws text 2023-08-12 13:48:04 +07:00
Wilfred Hughes 5f25bc0ebd Rename information in header should only be shown on first hunk 
Fixes #553
 2023-08-11 08:21:29 +07:00
ObserverOfTime 9deacbfb79
Move CData parsing to the scanner 2023-08-10 10:47:43 +07:00
Amaan Qureshi 845fd8d3d7
fix: detecting `pi_content`'s end should return true (#4) 2023-08-10 10:18:46 +07:00
ObserverOfTime d6354978e6
Rename enum members 2023-08-10 00:41:52 +07:00
ObserverOfTime ee045638fc
Extract `check_word` function 2023-08-10 00:14:35 +07:00
Amaan Qureshi 148ad3ddba
fix: only disallow `xml`, `xml-stylesheet`, `xml-model` in PITarget (#3) 2023-08-09 23:53:14 +07:00
ObserverOfTime 9fcc73c265
Add tests for expected errors 2023-08-09 21:03:49 +07:00
Amaan Qureshi 6520cae064
Move comment parsing to the scanner (#2) 2023-08-09 20:39:14 +07:00
ObserverOfTime f6b4a5e38b
Formatting and other nitpicks 2023-08-09 19:45:29 +07:00
Amaan Qureshi ddc1421229
Fix bugs and infinite loop hang 2023-08-09 18:26:06 +07:00
Wilfred Hughes f2f9260542 Use the Kotlin parser's built-in highlighting 2023-08-09 00:04:57 +07:00
Wilfred Hughes 56230d1c69 Merge commit '06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7' 2023-08-08 23:39:19 +07:00
Wilfred Hughes 4e77f83dd9 Merge commit '7dc4fb60390218b09bc351062eeede7dcdbb4d9f' 2023-08-08 23:37:28 +07:00
Wilfred Hughes d0cf8c6d0d Merge commit 'e398400a0b785af3cf571f5a57eccab242f0cdf9' 2023-08-08 23:28:07 +07:00