Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add kotlin language #1689

Merged
merged 7 commits into from
Feb 23, 2022
Merged

Add kotlin language #1689

merged 7 commits into from
Feb 23, 2022

Conversation

mdaffin
Copy link
Contributor

@mdaffin mdaffin commented Feb 21, 2022

Queries taken from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/kotlin seem to work well enough for my needs though I don't use kotlin heavily.

Queries taken from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/kotlin seem to work well enough for my needs though I don't use kotlin heavily.
@archseer archseer mentioned this pull request Feb 21, 2022
@kirawi
Copy link
Member

kirawi commented Feb 21, 2022

You'll need to change the scopes to the ones Helix uses: https://docs.helix-editor.com/themes.html#scopes

Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

left some comments but this is looking pretty good otherwise, nice work! 🚀

runtime/queries/kotlin/injections.scm Outdated Show resolved Hide resolved
runtime/queries/kotlin/injections.scm Outdated Show resolved Hide resolved
runtime/queries/kotlin/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/kotlin/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/kotlin/highlights.scm Outdated Show resolved Hide resolved
.gitmodules Show resolved Hide resolved
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great work! 🎊

@@ -0,0 +1,83 @@
;;; Imports

(package_header
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This locals definition doesn't match helix/tree-sitter, we use different scopes: https://github.com/helix-editor/helix/blob/master/runtime/queries/rust/locals.scm

It's okay to just remove locals.scm and we can do them in a follow-up PR though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

languages.toml Outdated Show resolved Hide resolved
Co-authored-by: Ivan Tham <[email protected]>
@archseer archseer merged commit f83843c into helix-editor:master Feb 23, 2022
@archseer
Copy link
Member

Thanks! 🎉

@mdaffin mdaffin deleted the kotlin branch February 23, 2022 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants