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.

Sign up for GitHub

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

Jump to bottom

Kotlin: Recognizing function parameters and return type #999

Merged
merged 3 commits into from
Oct 1, 2018
Merged

Kotlin: Recognizing function parameters and return type #999

merged 3 commits into from
Oct 1, 2018

Conversation

lordcodes
Copy link
Contributor

@lordcodes lordcodes commented Sep 22, 2018 •
edited
Loading

This is a follow up PR after #996. To allow this to be implemented it was branched from that branch.

  • Function parameters
  • Generic parameter types such as 'Array'
  • Return type
  • Generic return type

Fixes #997 and #998.

@lordcodes
Copy link
Contributor Author

CC @dblessing

@lordcodes
Copy link
Contributor Author

@jneen Sorry to bump this PR, but would be really keen to get these Kotlin PRs I have put forward included, as currently Rouge is almost unusable for Kotlin as it doesn't really highlight anything other than certain keywords.

dblessing
dblessing requested changes Oct 1, 2018
View reviewed changes
Copy link
Collaborator

@dblessing dblessing left a comment

Choose a reason for hiding this comment

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

Once #996 is merged we'll need a rebase here. Also, please squash some commits if you can to clean it up a bit.

lib/rouge/lexers/kotlin.rb Show resolved Hide resolved
spec/lexers/kotlin_spec.rb Outdated Show resolved Hide resolved
@dblessing dblessing added the author-action The PR has been reviewed but action by the author is needed label Oct 1, 2018
@dblessing
Copy link
Collaborator

Please rebase this now that I've merged your other 2 PRs. Please also squash things up a bit since there are 18 commits.

@lordcodes
Copy link
Contributor Author

Okay thank you, will do an interactive rebase and squash some commits tonight.

@lordcodes
Recognize function parameters and return
c5d0ef5
@lordcodes
Move fallback rules to the bottom
60d9fed 
Simple rules for when no complex rules are match, such as: comments, punctuation, operators, text, strings, numbers etc. This allows for specific rules to be tried first.
@lordcodes
Recognize return type on functions
aebe68f
@lordcodes
Copy link
Contributor Author

Branch all cleaned up.

@dblessing dblessing merged commit 6aee3b7 into rouge-ruby:master Oct 1, 2018
@lordcodes lordcodes deleted the kotlin-function-signature branch October 1, 2018 18:40
@lordcodes lordcodes mentioned this pull request Oct 1, 2018
Closed
@pyrmont pyrmont removed the author-action The PR has been reviewed but action by the author is needed label Aug 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dblessing dblessing dblessing requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Kotlin: Function parameters not highlighted
3 participants
@lordcodes @dblessing @pyrmont