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

109 Commits (00f6959a29844e9c82d456ea2c32631f94013fe8)

Author SHA1 Message Date
Hugo van Rijswijk 20db4283e7 Merge commit 'a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8' 
# Conflicts:
#	vendored_parsers/tree-sitter-scala/queries/scala/highlights.scm
 2024-07-23 12:49:30 +07:00
Wilfred Hughes ac5af62606 Merge commit 'b5dbafd164af7113e208de9b36068046f5ce8678' into f_sharp 2024-05-14 10:08:50 +07:00
Wilfred Hughes d92b65c5fd Merge remote-tracking branch 'thecentury/f#' 2024-05-14 09:46:55 +07:00
Wilfred Hughes d3e5aa5232 Merge remote-tracking branch 'blmaier/support-devicetree' 2024-05-13 16:50:13 +07:00
Wilfred Hughes 33542a47d5 Update CMake highlights for latest grammar 2024-05-07 08:29:34 +07:00
Wilfred Hughes 9207220a02 Merge commit '20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3' 2024-04-28 23:51:13 +07:00
Wilfred Hughes 1dd7bbebe8 Merge commit '09dbf221d7491dc8d8839616b27c21b9c025c457' 2024-04-28 23:48:30 +07:00
Wilfred Hughes a9be2fefa7 Remove awkard CRLF file from vendored parser 2024-04-28 23:43:26 +07:00
Wilfred Hughes 4dc541b261 Merge commit '72fd00128f1c38319670cbf4bcedbba0dc849d96' 2024-04-28 23:42:03 +07:00
Wilfred Hughes 27fb722ac7 Merge commit '1aafaff4d26dac5a36dd3495be33e1c20161d761' 2024-04-28 23:31:25 +07:00
Wilfred Hughes cce7b2ee1b Merge commit 'b466ffb4d7ce0a833754429ad8d3a02e950ed74c' 2024-04-28 23:00:00 +07:00
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