mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 6 Releases 19 Activity Actions

feat: Add Kotlin support #56

Merged
wetneb merged 4 commits from wetneb/mergiraf:kotlin into main 2025-01-17 09:47:16 +01:00
Conversation 3 Commits 4 Files changed 17 +130 -2
wetneb commented 2024-11-26 15:15:59 +01:00
Owner
Copy link

Adds support for Kotlin. The parser groups imports together by detecting the empty lines between them, but to do so it includes whitespace at the end of import_list nodes, which isn't something I had planned for in the pretty printer, so I had to make some adjustments accordingly.

Adds support for Kotlin. The parser groups imports together by detecting the empty lines between them, but to do so it includes whitespace at the end of `import_list` nodes, which isn't something I had planned for in the pretty printer, so I had to make some adjustments accordingly.
wetneb reviewed 2024-11-26 15:18:33 +01:00
Cargo.toml Outdated
@ -21,6 +21,7 @@ tree-sitter-rust = "0.23"
tree-sitter-json = "0.23"
tree-sitter-yaml = "0.6.1"
tree-sitter-java = "0.23"
tree-sitter-kotlin = { git = "https://github.com/alexle0nte/tree-sitter-kotlin.git", rev = "9b40bc22b49e616ea1a2fe6bca98fa211565aa7d" }
wetneb commented 2024-11-26 15:18:33 +01:00
Author
Owner
Copy link

This is because the latest published version of this crate only works with older versions of tree-sitter.
I would like to wait for https://github.com/fwcd/tree-sitter-kotlin/pull/150 to get merged and released before merging this, so that we only rely on official versions.

This is because the latest published version of this crate only works with older versions of tree-sitter. I would like to wait for https://github.com/fwcd/tree-sitter-kotlin/pull/150 to get merged and released before merging this, so that we only rely on official versions.
wetneb commented 2025-01-16 23:49:54 +01:00
Author
Owner
Copy link

I have switched the crate to tree-sitter-kotlin-ng, which is maintained here:
https://github.com/tree-sitter-grammars/tree-sitter-kotlin.

I've been told that grammar is still a work in progress but as far as I can tell it is better than the original, in some respects, so I'd be keen to start using it already.

I have switched the crate to [tree-sitter-kotlin-ng](https://crates.io/crates/tree-sitter-kotlin-ng), which is maintained here: https://github.com/tree-sitter-grammars/tree-sitter-kotlin. I've been told that grammar is still a work in progress but as far as I can tell it is better than the original, in some respects, so I'd be keen to start using it already.
wetneb changed title from WIP: feat: Add Kotlin support to feat: Add Kotlin support 2025-01-16 23:50:03 +01:00
ada4a approved these changes 2025-01-17 08:25:38 +01:00
ada4a left a comment
Owner
Copy link

LGTM! (given that I don't know anything Kotlin)

LGTM! (given that I don't know anything Kotlin)
examples/kotlin/working/class_body/Expected.kt
@ -0,0 +1,6 @@
object MergeAlgorithm {
ada4a commented 2025-01-17 08:21:43 +01:00
Owner
Copy link

very meta:)

very meta:)
wetneb merged commit 0a6f44ec1c into main 2025-01-17 09:47:16 +01:00
wetneb referenced this pull request from a commit 2025-01-17 09:47:17 +01:00
feat: Add Kotlin support (#56)
Sign in to join this conversation.
Reviewers
No reviewers
ada4a
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind
Bad merge
Examples where the merging algorithm doesn't work as well as it should

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
New language

  
Kind
Security
This is security issue

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind
Bad merge
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
New language
Kind
Security
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: mergiraf/mergiraf#56
No description provided.
Delete branch "wetneb/mergiraf:kotlin"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?