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

13695 Commits (syntactic_context)
 

Author SHA1 Message Date
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
Wilfred Hughes 20760558ff Merge commit '338db38330f0d25cba8e2c6428240ebc5e020264' 2023-08-08 23:26:49 +07:00
Wilfred Hughes 3612c472f5 Merge commit '5f2c94b897601b4029fedcce7db4c6d76ce8a128' 2023-08-08 23:24:52 +07:00
Wilfred Hughes 34d20d6665 Merge commit 'a2861e88a730287a60c11ea9299c033c7d076e30' 2023-08-08 23:24:08 +07:00
Wilfred Hughes 3eb014c0a7 Merge commit 'bbaa67a180cfe0c943e50c55130918be8efb20bd' 2023-08-08 23:22:22 +07:00
Wilfred Hughes db8797d6c2 Merge commit '7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc' 2023-08-08 23:01:48 +07:00
Wilfred Hughes a187d7a134 Improve rename styling 
It should use the heading with colour, consistent with other modes,
and the header should come before rename information.
 2023-08-08 08:53:33 +07:00
Wilfred Hughes 1e97003da9 Update to latest rayon 
This is also a tiny perf win (2.467B instructions to 2.429B
instructions for slow_before.rs).
 2023-08-08 08:22:30 +07:00
Wilfred Hughes 4fdc8eebcd Increase MSRV to 1.59 2023-08-07 20:32:08 +07:00
ObserverOfTime b74b74fbce
Simplify regular expressions 2023-08-07 11:20:38 +07:00
ObserverOfTime eac9a3b601
Fix multiline comments & add highlights 2023-08-06 12:44:53 +07:00
ObserverOfTime 3644348e66
Simplify some regular expressions 2023-08-06 11:53:54 +07:00
ObserverOfTime c6964c45dd
Introduce 'CDStart' node 2023-08-06 11:39:27 +07:00