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

514 Commits (70b4fe63c4973b04cc7bd40c6b7646d9c2430db8)
 

Author SHA1 Message Date
eugene yokota 70b4fe63c4
Merge pull request #390 from eed3si9n/wip/fix-fuzz 
Fix GitHub Actions
 2024-03-13 02:00:07 +07:00
Eugene Yokota 2935d41b82 Fix GitHub Actions 2024-03-13 01:20:29 +07:00
eugene yokota b3ac6a5d95
Merge pull request #388 from tree-sitter/generation 
chore: generate and sync latest changes
 2024-03-12 14:34:11 +07:00
GitHub 7802a9249c chore: generate and sync from e205ec827d 2024-03-12 16:45:05 +07:00
eugene yokota e205ec827d
Merge pull request #387 from eed3si9n/wip/tree-sitter-bump-0.21.0 
Update tree-sitter to 0.21.0
 2024-03-12 12:42:41 +07:00
Eugene Yokota 4c7275c70e Fix version numbers 2024-03-12 10:35:04 +07:00
Eugene Yokota 7dd646ff64 Refactor highlighting 
tree-sitter now uses last-wins rules for highlighting.
This moves the rules around to match the older highlighting.
Except operator, which I've now let it take precedence over `function.call`.
 2024-03-12 03:05:12 +07:00
Eugene Yokota fb4e246cff Commit bindings/node changes 2024-03-12 03:05:12 +07:00
Eugene Yokota 97c9cffb5d Update tree-sitter to 0.21.0 
See the tree-sitter release notes for details
- https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0
 2024-03-12 03:04:42 +07:00
eugene yokota 24fd647fec
Merge pull request #386 from tree-sitter/generation 2024-03-12 02:00:26 +07:00
GitHub 2914b02236 chore: generate and sync from 71ee31cd21 2024-03-12 05:04:15 +07:00
Chris Kipp 71ee31cd21
Merge pull request #381 from eed3si9n/wip/github-actions 
Update GitHub Actions and Node
 2024-03-11 08:52:44 +07:00
eugene yokota 3007ed523e
Fix character literal (#383) 
Previously the character literal was updated
mimicking that of Rust apparently,
but Scala doesn't have curly braces in the character literal.

We do, however, support two 'u' characters.
 2024-03-11 07:14:34 +07:00
Eugene Yokota 4eb5a61bd1 windows-latest 2024-03-10 23:55:47 +07:00
Eugene Yokota e70266814b Update GitHub Actions 2024-03-10 19:58:41 +07:00
Eugene Yokota 5e2fd33f0d Node 20 2024-03-10 19:58:41 +07:00
Amaan Qureshi e02f003d78
docs: update badges 2024-02-14 18:35:14 +07:00
Chris Kipp 1abd3d94c8
Merge pull request #376 from tree-sitter/generation 
chore: generate and sync latest changes
 2024-02-12 07:40:02 +07:00
GitHub 76a563c5e2 chore: generate and sync from 310f87253b 2024-02-12 05:04:23 +07:00
Vasil Markoukin 310f87253b
Merge pull request #375 from susliko/abstract-extensions 
Allow $.function_declaration as extension body
 2024-02-11 13:12:06 +07:00
Vasili Markoukin f8a4c1399f Allow $.function_declaration as extension body 
Fixes #374
 2024-02-11 12:43:02 +07:00
Chris Kipp 45b5ba0e74
Merge pull request #373 from tree-sitter/generation 
chore: generate and sync latest changes
 2024-01-19 09:28:14 +07:00
GitHub 6d84c41373 chore: generate and sync from 0c63ada18d 2024-01-19 05:03:38 +07:00
Vasil Markoukin 0c63ada18d
Merge pull request #372 from susliko/abstract-givens 
Allow for abstract givens
 2024-01-18 19:07:11 +07:00
Vasil Markoukin a95d787eee Allow for abstract givens 
Fixes #336
 2024-01-17 23:58:14 +07:00
eugene yokota 7891815f42
Merge pull request #371 from tree-sitter/dependabot/github_actions/dot-github/workflows/tj-actions/verify-changed-files-17 
chore(deps): bump tj-actions/verify-changed-files from 13 to 17 in /.github/workflows
 2024-01-02 12:27:17 +07:00
dependabot[bot] a5e34af32a
chore(deps): bump tj-actions/verify-changed-files in /.github/workflows 
Bumps [tj-actions/verify-changed-files](https://github.com/tj-actions/verify-changed-files) from 13 to 17.
- [Release notes](https://github.com/tj-actions/verify-changed-files/releases)
- [Changelog](https://github.com/tj-actions/verify-changed-files/blob/main/HISTORY.md)
- [Commits](https://github.com/tj-actions/verify-changed-files/compare/v13...v17)

---
updated-dependencies:
- dependency-name: tj-actions/verify-changed-files
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-02 16:43:34 +07:00
Vasil Markoukin 696965ee3b
Merge pull request #370 from tree-sitter/generation 
chore: generate and sync latest changes
 2023-12-27 10:35:53 +07:00
GitHub f59a8bb04c chore: generate and sync from 2b79741be7 2023-12-27 05:03:42 +07:00
eugene yokota 2b79741be7
Merge pull request #369 from susliko/infix-inline 2023-12-26 17:02:41 +07:00
susliko 6c99c83424 Allow infix inline modifier 
Fixes #366

Rebalance precedences of `match_expression` (which can contain "inline") and `modifiers`
 2023-12-27 00:22:18 +07:00
eugene yokota 866f94551c
Merge pull request #368 from susliko/fix-crash 
Fix crashes inside Markdown
 2023-12-21 16:45:35 +07:00
susliko 53c4cb64de Fix crashes inside Markdown 
Resolves #365
Problem
---
Parsing Markdown with nested Scala code using significant indentation crashes with SIGSEGV
Example code:
```scala
for
  i <- 1 to 10
yield i
```

Solution
---
Stop calling `lexer->get_column` in `scanner.c` without prior eof-checks
 2023-12-22 00:23:51 +07:00
eugene yokota 1b4c2fa5c5
Merge pull request #364 from tree-sitter/generation 2023-09-24 22:52:15 +07:00
GitHub 3894c16a64 chore: generate and sync from 1d3a1f9f18 2023-09-24 05:03:56 +07:00
Vasil Markoukin 1d3a1f9f18
Merge pull request #363 from antosha417/shebang 
Support shebang.
 2023-09-23 17:06:34 +07:00
antosha417 526d3b148c
Support shebang. 
Fixes #351
 2023-09-23 17:52:21 +07:00
Chris Kipp aa84398ad7
Merge pull request #362 from tree-sitter/generation 
chore: generate and sync latest changes
 2023-09-20 07:36:21 +07:00
GitHub 2b2b82838a chore: generate and sync from 8f070fe470 2023-09-20 05:03:50 +07:00
eugene yokota 8f070fe470
Merge pull request #357 from susliko/better-semicolons 
Better semicolons
 2023-09-19 23:59:57 +07:00
susliko b80c70f804 Bump dotty to 85 2023-09-20 00:21:33 +07:00
susliko fed5476126 Allow semicolons before 'else' 
Fixes #299

Add optional semicolon in alternative branch of `if_expression` and remove right precedence of `if_expression`
 2023-09-20 00:16:32 +07:00
susliko cd5d3a248f Allow semicolons as only content of blocks 
Fixes #300
 2023-09-19 23:07:15 +07:00
Chris Kipp 59ab070df6
Merge pull request #356 from tree-sitter/generation 
chore: generate and sync latest changes
 2023-09-19 08:27:18 +07:00
GitHub 4f761f0c40 chore: generate and sync from 27a40cf3cd 2023-09-19 06:26:10 +07:00
eugene yokota 27a40cf3cd
Merge pull request #352 from susliko/next-line-derives 
Fix `derives` clause on a new line
 2023-09-19 01:12:04 +07:00
eugene yokota 5fa09e9838
Merge pull request #353 from susliko/trait-derives 
Derives clause for traits
 2023-09-19 01:11:40 +07:00
eugene yokota 80fe560ac4
Merge pull request #355 from tree-sitter/generation 
chore: generate and sync latest changes
 2023-09-19 01:07:28 +07:00
GitHub ef639d4f35 chore: generate and sync from 045ce59575 2023-09-19 05:03:49 +07:00
eugene yokota ee2e9ab164
Merge branch 'master' into next-line-derives 2023-09-18 23:14:57 +07:00