The results in code search does not highlight the full sentence in Bitbucket 6.1

Issue Summary

Elasticsearch bundled with Bitbucket 6.1 is now searching for the phrases including dots, commas and other symbols however in the Code Search results the full sentence is not highlighted but only the first word before the dot or comma.

Environment

Bitbucket 6.1.2
PostgreSQL 9.6
Elasticsearch v.6.5.3

Steps to Reproduce

1. Create or import the code into the repository containing the statements with dots, for example java.net.Socket
2. Let the code search index the changes
3. Search for "java.net.Socket"

Expected Results

The search results contain only full match and "java.net.Socket" is highlighted.

Actual Results

The search results contain only full match and "java" is highlighted.

Workaround

Currently there is no known workaround for this behavior. A workaround will be added here when available. Search results are still accurate even though the full phrase is not highlighted.