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

Topic/more scala fixes #996

Merged
merged 3 commits into from Dec 2, 2015
Merged

Conversation

non
Copy link
Contributor

@non non commented Nov 24, 2015

Fix some remaining issues with scala highlighting.

After the last fix to case classes, types in the
parameter list were not highlighting correctly.
There were also some remaining issues with the
delimiters being highlighted.

This PR cleans all that up, and contains small
fixes to two styles which lacked an important
class (.hljs-type) which Scala needs.

After the last fix to case classes, types in the
parameter list were not highlighting correctly.
There were also some remaining issues with the
delimiters being highlighted.

This commit seems to allow parameters (and type
parameters) to classes to be highlighted correctly
in basically all styles.
This commit adds the .hljf-type class name to the 'vs'
and 'hopscotch' styles. The lack of this makes the
highlighting for Scala (and possibly other styles)
less attractive.
@non
Copy link
Contributor Author

non commented Nov 24, 2015

Ugh sorry, looks like my changes messed up source detection. I'll try to figure out what happened.

@Sannis Sannis added this to the 9.0 milestone Nov 24, 2015
@@ -73,10 +73,22 @@ function(hljs) {
relevance: 10
},
{
className: 'typeParams',
Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like this should be just type or have no separate class name.

@isagalaev isagalaev merged commit 3497ae9 into highlightjs:master Dec 2, 2015
@isagalaev
Copy link
Member

Merged. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants