Thanks, that last one is the same issue as #1. I do not have a lot of time to devote to this project, but I would gladly accept pull requests to fix these.

The last two comments had to do with template literals. Those should be fixed. @pioz I believe your issue is still valid. Also one minor annoyance that I have to figure out.

Doing this will not highlight correctly

return (
    <div>
        whatever
    </div>
);

But this is fine

return 
    <div>
        whatever
    </div>;

And so is this

return (<div>
    whatever
</div>);

@ccampbell Your first example seem good, with the current version :