Support For Annotations in Java

[desertjim]

1. Adding annotation token
2. Making the annotation token match before function

[zeitgeist87]

Hi @desertjim

Thanks for contributing. Annotations are indeed missing in Java.

Your PR contains a lot of minified files, that have nothing to do with Java annotations. What minifier did you use to create these?

You either have to add the css class .token.annotation to all themes, or use the alias property:

'annotation': {
    pattern: /(@{1}\w*\(.*?\))|(@{1}\w+)/i,
    alias: 'regex'
}

Isn't @{1} equivalend to just @?

[desertjim]

Hi @zeitgeist87

I was just using gulp. I thought it was minifying the js files. Here is what I did:

• 1. reset the mini files (except prism-java.min.js)
• 2. added .token.annotation to all the themes
• 3. update the regex to just use @ instead of @{1}
• 4. tested it with all the themes, looks good

[zeitgeist87]

I was just using gulp. I thought it was minifying the js files.

gulp is correct. Maybe you are using an older or newer version of gulp-uglify. You could try executing npm update before you call gulp.

1. tested it with all the themes, looks good

I am not sure if the colors you chose are such a good idea. They are very bright and prominent. My Eclipse standard theme for Java uses a more subtle grayish color for annotations. Intellij uses some kind of olive green. I am not sure how other IDEs and themes style annotations:

We should probably use a color, that is more familiar to most Java developers. What do you think? Do you have a particular reason for choosing bright orange?

The groovy language already has a simpler regex for annotations:

Prism.languages.insertBefore('groovy', 'function', {
    'annotation': {
        pattern: /(^|[^.])@\w+/,
        lookbehind: true
    }
});

Also you don't need the capturing groups and the case insensitive flag. This should be enough: /@\w*\(.*?\)|@\w+/. Do we really need to capture the annotation parameters @{1}\w*\(.*?\)?

[desertjim]

I just installed gulp-uglify so I must be using a newer version.

I do like the color choice, but my aim was to not end up having code directly adjacent to the annotations being the same color. So I just picked an existing color to make sure it was still in the same theme and went with it. To avoid bikeshedding I'll leave the color to whatever you suggest :).

I can update the regex to match groovy, should I use the lookBehind: true also(sorry not familiar with this)?

[zeitgeist87]

To avoid bikeshedding I'll leave the color to whatever you suggest :).

Well I am not really sure what the best choice is here. Here are a few examples:

• Netbeans

• Stackoverflow

• Github

public class Duck extends Base {
    @Override
    public void quack() {
        System.out.println("Quack");
    }
}

I am open for suggestions, but in my opinion annotations should not stand out more than for example keywords.

I can update the regex to match groovy, should I use the lookBehind: true also(sorry not familiar with this)?

Yes lookbehind is necessary.

[desertjim]

How about this? Still in the theme, darker and not the same color as surrounding text:

[LeaVerou]

What about aliasing it to punctuation? Then it would look discreet in all themes.
(just an idea)

[zeitgeist87]

What about aliasing it to punctuation? Then it would look discreet in all themes.
(just an idea)

Yes let's do that. I think it looks nice. We can always change it later:

@desertjim You could also add alias: 'punctuation' to the Groovy language while you're at it. Thanks!

[desertjim]

@zeitgeist87 should be good now

[zeitgeist87]

@zeitgeist87 should be good now

Thanks! It looks good to me. You should also squash down all of your commits into a single commit. Otherwise we get all the back and forth into the PrismJS git log after the merge.

[desertjim]

ok, it's ready

[just-boris]

Is this going to be released?

[LeaVerou]

We make releases periodically, but it's already in Prism. Everyone downloading Prism from the website can get it. :)

[just-boris]

I am installing this from NPM and it seems that it doesn't have this feature. Could you please make a release for it?

[LeaVerou]

We do not make releases for specific features, we release periodically. This will be in the next release, which will happen soon.

[chenbihao]

How about this? Still in the theme, darker and not the same color as surrounding text:这个怎么样？仍然在主题中，颜色较暗且与周围文本的颜色不同：

oh does not feel so good now, which will cause comments // and annotations @ to confuse

like this: