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

148 Commits (267a2eaef3428fd44e7f4ad5088620c6b00d2cdc)

Author SHA1 Message Date
Wilfred Hughes a5b2587eaa Merge commit 'eb68645662a3f7bf7fdd4bcb9531585f54c8570e' 2024-04-28 22:54:18 +07:00
Wilfred Hughes c2df185d49 Update Lua parser 
Closes #701
 2024-04-28 22:36:23 +07:00
Wilfred Hughes 50d90f6736 Add 'vendored_parsers/tree-sitter-lua/' from commit 'a24dab177e58c9c6832f96b9a73102a0cfbced4a' 
git-subtree-dir: vendored_parsers/tree-sitter-lua
git-subtree-mainline: 9e44712cda
git-subtree-split: a24dab177e
 2024-04-28 22:06:22 +07:00
Wilfred Hughes 9e44712cda Remove old lua grammar 2024-04-28 22:06:00 +07:00
Wilfred Hughes 688aaa83f8 Merge commit '02b4ee757654b7d54fe35352fd8e53a8a4385d42' 2024-04-28 17:32:23 +07:00
Wilfred Hughes 84439c7c58 Remove unnecessary forward declaration in attempt to fix windows build 2024-03-04 21:54:48 +07:00
Wilfred Hughes d095465715 Merge commit 'ee44b89c2cc71ab1346322367829d08a21decc24' 2024-03-04 20:38:40 +07:00
Wilfred Hughes 7ddd8879b1 Merge branch 'scheme-support' of github.com:kutsurak/difftastic into kutsurak-scheme-support 2024-03-04 08:46:59 +07:00
Wilfred Hughes 2ffd7553b7 Remove vendored_parsers/vendor/ copy 
This seems to be redundant with vendored_parsers/, and looks
like a mistake when I renamed the vendor directory.
 2024-03-04 08:40:40 +07:00
Wilfred Hughes 05b9e6dc55 Update syntax highlighting for perl 2024-03-04 08:36:05 +07:00
Wilfred Hughes 5d1332d5cc Merge commit 'a882a928d4930716896039d1c10e91b6d7444c48' 2024-03-03 12:36:47 +07:00
Brandon Maier e6b27caf06 Add support for devicetrees 2024-02-28 17:11:53 +07:00
Brandon Maier dee4c9bdbc Add 'vendored_parsers/tree-sitter-devicetree/' from commit '2087a5b965db2a9efabab958a27fd8ddf43038a2' 
git-subtree-dir: vendored_parsers/tree-sitter-devicetree
git-subtree-mainline: 1b2099d7a4
git-subtree-split: 2087a5b965
 2024-02-28 17:11:23 +07:00
Wilfred Hughes 7a00339977
Merge pull request #634 from evanrichter/smali 
Smali language support
 2024-02-19 11:57:54 +07:00
Wilfred Hughes e52849ebba Merge commit '9fa49ff3315987f715ce5666ff979a7742fa8a98' 2024-02-15 08:54:57 +07:00
Wilfred Hughes 58536b9426 Merge commit '7db8390a16a2cae317f4f4423a7b642cd4cad8c9' 
Fixes #515
 2024-02-13 08:38:53 +07:00
Wilfred Hughes a721bef7a7 Merge commit '098bd31b7f838a31cce08db4091e989ea42f3ef6' 2024-02-13 08:36:21 +07:00
Panagiotis Koutsourakis 67ada1ccd4 Add support for Scheme 2024-02-12 10:20:57 +07:00
Panagiotis Koutsourakis 1dc45d84c6 Add 'vendored_parsers/tree-sitter-scheme/' from commit '85b6188fb77c03dfb01d13e58e2844450506860c' 
git-subtree-dir: vendored_parsers/tree-sitter-scheme
git-subtree-mainline: 3476a68efb
git-subtree-split: 85b6188fb7
 2024-02-12 10:19:44 +07:00
Evan Richter d106c979ee add smali language support 2024-02-01 15:41:14 +07:00
Evan Richter 6ae210999c Add 'vendored_parsers/tree-sitter-smali/' from commit '5ae51e15c4d1ac93cba6127caf3d1f0a072c140c' 
git-subtree-dir: vendored_parsers/tree-sitter-smali
git-subtree-mainline: 77c641748f
git-subtree-split: 5ae51e15c4
 2024-02-01 14:35:46 +07:00
Mikhail Brinchuk 297fa952c2
Merge branch 'Wilfred:master' into f# 2024-01-29 11:45:31 +07:00
Mikhail Brinchuk 0e4723cf0e Added F# support 2024-01-28 12:11:53 +07:00
Mikhail Brinchuk dff5172e54 Add 'vendored_parsers/tree-sitter-f-sharp/' from commit 'd7e15c6d88c2b41766409c4e258caaf14733ed01' 
git-subtree-dir: vendored_parsers/tree-sitter-f-sharp
git-subtree-mainline: 2d61aefb84
git-subtree-split: d7e15c6d88
 2024-01-28 11:58:26 +07:00
Armin Brauns c5638750d6 Add tree-sitter-vhdl 2024-01-09 09:23:51 +07:00
Armin Brauns 3de60c60ac Add 'vendored_parsers/tree-sitter-vhdl/' from commit 'b863231107ef4471ad007a2405ef319875da5b4e' 
git-subtree-dir: vendored_parsers/tree-sitter-vhdl
git-subtree-mainline: 2d61aefb84
git-subtree-split: b863231107
 2024-01-08 14:36:57 +07:00
Wilfred Hughes db86b28a28 Add support for Objective-C 
Closes #600

Co-authored-by: Nick Moore <nick@pilotmoon.com>
 2024-01-07 12:50:19 +07:00
Wilfred Hughes 6338c3b314 Add 'vendored_parsers/tree-sitter-objc/' from commit '62e61b6f5c0289c376d61a8c91faf6435cde9012' 
git-subtree-dir: vendored_parsers/tree-sitter-objc
git-subtree-mainline: 8eebc24165
git-subtree-split: 62e61b6f5c
 2024-01-07 12:15:51 +07:00
Rodolphe Blancho e18b5d0712
Merge branch 'master' into feature/salesforce_apex_support 2023-12-05 12:31:59 +07:00
Wilfred Hughes 8400000b3b Merge commit '494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8' 2023-10-26 08:46:53 +07:00
Wilfred Hughes 81714c17ce
Merge pull request #573 from brneor/scss 
Add Scss parser
 2023-10-11 08:57:58 +07:00
Rodolphe Blancho 5256d9c98e Merge branch 'master' into feature/salesforce_apex_support 2023-10-11 09:56:51 +07:00
Wilfred Hughes ab1966b7d2 Merge commit '3fef30de8aee74600f25ec2e319b62a1a870d51e' 
Update JSON parser. This allows multiple items, so JSONL is no longer
a parse error.

Fixes #528
 2023-10-07 10:47:05 +07:00
Rodolphe Blancho 05d78ca741 add support for Salesforce Apex 
Apex Language documentation:
https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_dev_guide.htm

Uses https://github.com/aheber/tree-sitter-sfapex
 2023-10-06 11:08:02 +07:00
Rodolphe Blancho b818b47091 Add 'vendored_parsers/tree-sitter-sfapex/' from commit 'a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd' 
git-subtree-dir: vendored_parsers/tree-sitter-sfapex
git-subtree-mainline: 1d32b477c1
git-subtree-split: a768c956b6
 2023-10-05 08:37:36 +07:00
Breno Reis 1bffcf4e2b
add support for SCSS 2023-09-20 14:26:43 +07:00
Breno Reis 4b43221b9a Add 'vendored_parsers/tree-sitter-scss/' from commit 'c478c6868648eff49eb04a4df90d703dc45b312a' 
git-subtree-dir: vendored_parsers/tree-sitter-scss
git-subtree-mainline: 462f5d4b7e
git-subtree-split: c478c68686
 2023-09-20 14:11:54 +07:00
Wilfred Hughes 725180becc Fix references to ../common when compiling XML parser for package 2023-09-09 10:17:46 +07:00
Wilfred Hughes 9134593a39 Add XML support 
Fixes #10
 2023-09-08 23:43:20 +07:00
Wilfred Hughes 40e303eb1b Add 'vendored_parsers/tree-sitter-xml/' from commit '9deacbfb79cb3527a0396255beb17e1bba3f2052' 
git-subtree-dir: vendored_parsers/tree-sitter-xml
git-subtree-mainline: d56f775f31
git-subtree-split: 9deacbfb79
 2023-09-08 22:10:28 +07:00
Wilfred Hughes 9f03834dd7 Merge commit '42ab5ca0e6bb7130c397c7ca10440fd5cfc2d564' 2023-08-23 20:57:50 +07:00
Wilfred Hughes 9403e410c2 Merge commit 'c01fb4e38587e959b9058b8cd34b9e6a3068c827' 2023-08-21 08:52:30 +07:00
Wilfred Hughes 2126a63c4c Add 'vendored_parsers/tree-sitter-rust/' from commit 'afb6000a71fb9dff3f47f90d412ec080ae12bbb4' 
git-subtree-dir: vendored_parsers/tree-sitter-rust
git-subtree-mainline: c266bf23fc
git-subtree-split: afb6000a71
 2023-08-18 22:35:38 +07:00
Wilfred Hughes c266bf23fc Remove tree-sitter-rust subtree so we can use the unforked upstream 2023-08-18 22:35:04 +07:00
Wilfred Hughes 881fcb553a Merge commit 'c0f5797a728fc4ebd78a8b0e436b1494a8ab5f51' 2023-08-18 22:25:00 +07:00
Wilfred Hughes d901ac6e9e Silence warning on compiling tree-sitter-go 2023-08-12 11:35:48 +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 69da133ab0 Merge commit '2c7aff437deed72bbceceab95797b3909cc4627d' 2023-07-24 21:50:22 +07:00
Wilfred Hughes f43e91faf7 Merge commit 'ad095896dd223f1c22b85ac5ec84ab11fb732b07' 2023-07-24 21:28:47 +07:00
Wilfred Hughes 685a2ef8d5 Merge remote-tracking branch 'grunweg/master' 2023-07-20 22:41:56 +07:00
Wilfred Hughes a15b92afaf Merge commit '6c8329e2da78fae78e87c3c6f5788a2b005a4afc' 2023-07-15 15:59:11 +07:00
Wilfred Hughes ba29064643 Merge commit 'dd02e510e92e057bdcadc4def1a3b28bed5fbea3' 2023-06-12 08:21:58 +07:00
Mike Grunweg efdef4809d Add syntax highlighting definitions for LaTeX. 
File copied from a separate repository.
 2023-05-05 22:00:15 +07:00
Mike Grunweg 7077c39b0b Add LaTeX parser to the build. 
Include `scanner.c` as extra file; this is definitely needed.
Also adding `parser.c` seems sensible, but yields errors about multiple definitions.
 2023-05-05 21:59:04 +07:00
Mike Grunweg 8bdfb1d1dc Add 'vendored_parsers/tree-sitter-latex/' from commit 'cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c' 
git-subtree-dir: vendored_parsers/tree-sitter-latex
git-subtree-mainline: 2934c08d07
git-subtree-split: cd3cc493a9
 2023-05-05 13:40:46 +07:00
Valentin b86d4dbf9e Add solidity support 2023-04-05 11:12:19 +07:00
Valentin 00f587d0fe Add 'vendored_parsers/tree-sitter-solidity/' from commit '168020304759ad5d8b4a88a541a699134e3730c5' 
git-subtree-dir: vendored_parsers/tree-sitter-solidity
git-subtree-mainline: 8c004be87b
git-subtree-split: 1680203047
 2023-04-04 16:59:26 +07:00
Wilfred Hughes 6d99ea41c1 Merge commit 'ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5' 2023-03-17 00:46:11 +07:00
Wilfred Hughes 6ae589766c Merge commit 'ab75be9750e6f2f804638824d1790034286a830c' 2023-03-17 00:45:03 +07:00
Wilfred Hughes 6a455faa06 Merge commit 'b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3' 2023-03-17 00:14:19 +07:00
Wilfred Hughes e24ca47173 Merge commit '5720b249490b3c17245ba772f6be4a43edb4e3b7' 2023-03-17 00:13:21 +07:00
Wilfred Hughes aef2a84fa5 Merge commit 'f1106bf834703f1f2f795da1a3b5f8f40174ffcc' 2023-03-17 00:09:44 +07:00
Wilfred Hughes 8266e0a161 Merge commit '64457ea6b73ef5422ed1687178d4545c3e91334a' 2023-03-17 00:05:52 +07:00
Wilfred Hughes f76dfdc4f0 Merge commit '3c24aa9365985830421a3a7b6791b415961ea770' 2023-03-17 00:01:50 +07:00
Wilfred Hughes a3cad19bad Merge commit '869dff3ceb8823ca4b17ca33b663667c8e41e8ba' 2023-03-16 22:09:41 +07:00
Wilfred Hughes b914149ccf Merge commit '399605a02bcd5daa309ce63a6459c600dce3473f' 2023-03-16 08:20:22 +07:00
Wilfred Hughes b1ecf00602 Merge commit 'fcacbeb4af6bcdcfb4527978a997bb03f4fe086d' 2023-03-15 23:50:56 +07:00
Wilfred Hughes 630e843a66 Merge commit '03fa93db133d6048a77d4de154a7b17ea8b9d076' 2023-03-15 23:24:58 +07:00
Wilfred Hughes b636201a8c Merge commit 'f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2' 2023-03-15 21:49:50 +07:00
Wilfred Hughes 4eaba59c5e Merge commit 'b338fa9f4807b9e0336cd4dde04948a8c324a4cf' 2023-03-15 16:11:16 +07:00
Wilfred Hughes 20ad284882 Add 'vendored_parsers/tree-sitter-clojure/' from commit '421546c2547c74d1d9a0d8c296c412071d37e7ca' 
Closes #448

git-subtree-dir: vendored_parsers/tree-sitter-clojure
git-subtree-mainline: ebfc043a4a
git-subtree-split: 421546c254
 2023-03-15 15:43:55 +07:00
Wilfred Hughes ebfc043a4a Remove old fork of tree-sitter-clojure 2023-03-15 15:36:43 +07:00
Karl Ding 9222b92e1e Add Ada parser highlighting symlink 
Add a symlink to the highlights.scm provided by the Ada treesitter
dependency.
 2023-03-14 21:46:40 +07:00
Karl Ding 2c8bda32c9 Add symlink to Ada parser subdirectory 
Add a symlink to the 'src/' parser subdirectory.
 2023-03-14 21:46:40 +07:00
Karl Ding 0febe0af43 Add vendored tree-sitter-ada parser 
Add 'briot/tree-sitter-ada' as a vendored git subtree dependency for
supporting Ada code.
 2023-03-14 21:46:40 +07:00
Wilfred Hughes 9556cd978e Merge branch 'delehef/master' 2023-02-21 08:46:07 +07:00
6cdh 5e659e2d98 add racket highlight 2023-02-21 08:30:00 +07:00
Franklin Delehelle a0b9df0e29
Add support for Newick tree files 2023-02-16 15:52:16 +07:00
Franklin Delehelle 7da090705c Add 'vendored_parsers/tree-sitter-newick/' from commit '44d8a6382493b800fec01df48524a5b24eb6f7ad' 
git-subtree-dir: vendored_parsers/tree-sitter-newick
git-subtree-mainline: a7f06471e1
git-subtree-split: 44d8a63824
 2023-02-16 10:24:42 +07:00
6cdh 3c418168a4 fix bug in here_string 2023-02-12 16:45:38 +07:00
6cdh 24ccd0c527 Merge commit '1a5df0206b25a05cb1b35a68d2105fc7493df39b' into add-racket 2023-02-12 16:41:16 +07:00
6cdh fe756905bf added Racket support 2023-02-12 13:39:58 +07:00
6cdh 62a5f20bf6 Add 'vendored_parsers/tree-sitter-racket/' from commit 'dc9c33451fefc2d84d226e55c828adc8a66f2e37' 
git-subtree-dir: vendored_parsers/tree-sitter-racket
git-subtree-mainline: a7f06471e1
git-subtree-split: dc9c33451f
 2023-02-12 11:49:52 +07:00
Wilfred Hughes 0f1d323bf3 Disable lua-match? highlighting predicates 
This fixes inaccurate type highlighting in Scala.

See #310
 2023-02-10 08:45:41 +07:00
Hugo van Rijswijk bd33580eed update highlights scala.scm 2023-02-08 11:05:02 +07:00
Hugo van Rijswijk 0a4c977311 Merge commit '628e0aab6c2f7d31cf3b7d730f964d4fd9b340ee' 2023-02-08 10:50:58 +07:00
Wilfred Hughes 5ed4bac8a5 Add support for R 
Fixes #470
 2023-01-26 08:50:00 +07:00
Wilfred Hughes c2e047a7bf Add 'vendored_parsers/tree-sitter-r/' from commit '80efda55672d1293aa738f956c7ae384ecdc31b4' 
git-subtree-dir: vendored_parsers/tree-sitter-r
git-subtree-mainline: 5dfa4b64a9
git-subtree-split: 80efda5567
 2023-01-26 08:18:58 +07:00
Wilfred Hughes b264360b02 Fix missing swift files from 08b3ff138 2023-01-12 08:15:25 +07:00
Wilfred Hughes 08b3ff138f Rename vendor/ directory 
Closes #453
 2023-01-10 08:35:01 +07:00