Please make the HighlightQuery class public

We're using the highlighter directly in our code, and the introduction of the package-scoped HighlightQuery in 4aa59aff0058b05e822592431eda4a469a6b9eef has made this impossible without building our own little fork.