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

11200 Commits (79d594fc5661e73e91d11b8f070f941cd727bdeb)
 

Author SHA1 Message Date
Yuya Nishihara 8da1e5ed7e cargo: fix repository URL (#1) 2022-07-07 14:12:37 +07:00
Yuya Nishihara 0d2c4763a6 cargo: fix repository URL (#1) 2022-07-07 14:11:37 +07:00
Yuya Nishihara 7cf28e8a9c include queries/*.scm symlinks in master branch (fixes #1) 2022-07-07 13:44:16 +07:00
Yuya Nishihara f26a852567 merge with dev 2022-07-07 13:34:01 +07:00
Yuya Nishihara e8b1304ec7 github: ensure npm/cargo do the job without 'make generate' (#1) 
This should fail at the moment.
 2022-07-07 13:30:21 +07:00
Tom Beckmann 49e82b1bce
Fix empty range for ternary question mark (#215) 
skip() was used after the qmark token, which resets the start position:
9df064c9fe/lib/src/lexer.c (L184)
 2022-07-06 12:52:21 +07:00
Hendrik van Antwerpen c94f0d5c31
Remove and ignore yarn.lock, since we use npm (#216) 2022-07-05 10:43:43 +07:00
Wilfred Hughes 75fe85017b Add Julia to languages table 2022-07-04 22:44:36 +07:00
Wilfred Hughes 0e7ab02741 Mention syntax highlighting fixes in last release 
Introduced by d785886294
 2022-07-04 20:07:49 +07:00
Wilfred Hughes c745de51b0 Roll version 2022-07-04 20:05:31 +07:00
Wilfred Hughes 36e11985ce Mention Julia in changelog 2022-07-04 20:04:27 +07:00
Wilfred Hughes d05a3d9373 Add Julia sample files 2022-07-04 19:57:00 +07:00
Wilfred Hughes 975ff6eedd Update regression tests now that @conditional is highlighted 
This is mostly `if` keywords in various positions now being
highlighted as keywords.
 2022-07-04 19:54:00 +07:00
Wilfred Hughes ddb4bc7013 Show context when regression test fails 2022-07-04 19:51:04 +07:00
Wilfred Hughes d785886294 Add syntax highlighting for Julia 2022-07-04 19:35:34 +07:00
Wilfred Hughes 5fcd778503 Clarify wording for adding syntax highlighting 2022-07-04 19:16:31 +07:00
Wilfred Hughes 7cda64e0bc Add Julia symlink for building 2022-07-04 17:57:38 +07:00
Wilfred Hughes 970fd7f9d3 Add Julia support 
Fixes #284
 2022-07-04 15:50:28 +07:00
Wilfred Hughes 9c19905c22 Add 'vendor/tree-sitter-julia/' from commit 'fc60b7cce87da7a1b7f8cb0f9371c3dc8b684500' 
git-subtree-dir: vendor/tree-sitter-julia
git-subtree-mainline: 9cff13985e
git-subtree-split: fc60b7cce8
 2022-07-04 15:25:30 +07:00
Wilfred Hughes 9cff13985e Update changelog for #301 2022-07-04 15:23:38 +07:00
Wilfred Hughes d72251f9fa cargo fmt 2022-07-04 15:11:38 +07:00
Wilfred Hughes 719654d462
Merge pull request #301 from lilydjwg/master 
use unicode-width to align CJK characters
 2022-07-04 15:07:25 +07:00
Uy Ha 13c7c529d7 fix: add scanner.cc for Rust 
Co-authored-by: ShootingStarDragons <ShootingStarDragons@protonmail.com>
 2022-07-04 12:48:46 +07:00
Uy Ha b766bd4896 fix: regenerate files for updated name 
Co-authored-by: ShootingStarDragons <ShootingStarDragons@protonmail.com>
 2022-07-04 12:42:23 +07:00
Wilfred Hughes 156c701459 Add large files from #293 for test 
This file pair exposed a bunch of perf issues, so it's useful to keep
it around.
 2022-07-03 22:18:30 +07:00
Wilfred Hughes d70cc70971 Silence C++ warning from tree-sitter-html 2022-07-03 22:11:29 +07:00
Wilfred Hughes 2d43075841 HTML: include doublequotes in attribute atoms 2022-07-03 22:11:25 +07:00
Uy Ha 961d625282 chore: update dependencies and regenerate parser.c 2022-07-04 12:01:24 +07:00
Wilfred Hughes 493a4bd62a
Merge pull request #305 from benmanns/add-html-parser 
feat: Add HTML parser
 2022-07-03 21:41:18 +07:00
Wilfred Hughes d96ccc884f
Merge branch 'master' into add-html-parser 2022-07-03 21:40:57 +07:00
lilydjwg 0648b0a6cf add sample_files for Chinese (CJK fullwidth characters) 
One of the other three "expected" updates is caused by a fullwidth emoji
and others are removal of colored empty strings.
 2022-07-04 12:01:49 +07:00
lilydjwg 5d2fdf65b9 split_string_by_width: return &str to avoid allocations 
since we're returning padding numbers, we no longer allocate for new Strings any more.
 2022-07-04 11:49:06 +07:00
lilydjwg 526b24d00d Merge remote-tracking branch 'upstream/master' 
Conflicts:
      src/display/side_by_side.rs
 2022-07-04 11:04:22 +07:00
lilydjwg 612d45196a split_string_by_width: since we pad in the middle, we need to tell split_and_apply how many bytes we've padded 2022-07-04 10:55:38 +07:00
Wilfred Hughes f10cfa00cc Limit the graph size based on the number of predecessors found 
Fixes #183
Fixes #306
 2022-07-03 18:23:17 +07:00
Wilfred Hughes 338e815e9b More clippy fixes 2022-07-03 11:23:18 +07:00
Wilfred Hughes 51ddcef393 Make clippy happier 2022-07-03 11:20:44 +07:00
Wilfred Hughes 186a2f98f1 Take the shortest edge when constructing the path 
Previously we assumed that there was a single edge between nodes. This
is true of the current implementation, but not in all experiments.

This is also a tiny performance win (0.2% instruction count reduction).
 2022-07-03 11:16:33 +07:00
Fisher Sun cf394604ae
Use nvim-treesitter version of highlights.scm (#87) 
This commit replaces highlights.scm with nvim-treesitter's version.
To comply with nvim-treesitter's Apache license,
I have added a copy of the Apache License.
I have also added the Apache boilerplate to the top of highlights.scm
to clarify its license.
 2022-07-02 11:46:11 +07:00
Benjamin Manns 99813e7ff0 Add entry to adding_a_parser.md about sliders 2022-07-01 12:23:36 +07:00
Benjamin Manns d131ae1d35 Add HTML parser 2022-07-01 12:23:20 +07:00
Benjamin Manns edce245beb Add 'vendor/tree-sitter-html/' from commit '29f53d8f4f2335e61bf6418ab8958dac3282077a' 
git-subtree-dir: vendor/tree-sitter-html
git-subtree-mainline: 5c19ac600d
git-subtree-split: 29f53d8f4f
 2022-07-01 12:23:11 +07:00
Maksim Novikov 218b672499
Merge branch 'window-function-calls' 2022-06-30 19:50:55 +07:00
Maksim Novikov d47bb2f1cd
Merge branch 'aggregate-expressions' 2022-06-30 19:47:36 +07:00
Wilfred Hughes 5c19ac600d Fix duplicate newlines when a whole file is novel 
Broken in trunk but works fine in 0.29.1. Fixes #302
 2022-06-29 21:36:52 +07:00
Jonathan Arnett 85c0753e8e Version 0.22.1 2022-06-29 21:57:03 +07:00
Jonathan Arnett 08901b401c Version 0.22.0 2022-06-29 21:57:03 +07:00
Jonathan Arnett ac8c9438f8 Add scanner.c to files to be compiled for release 2022-06-29 21:57:03 +07:00
Tim Luo 1cdb6abb48 Support window definitions & window function calls 2022-06-29 10:58:25 +07:00
Tim Luo bf3ea7293f Improve function call to support aggregate expressions 2022-06-29 10:43:45 +07:00