@oltarasenko I just noticed you are maintaining your own fork of Gollum. I found its matching algorithm having some severe bugs and also feels hard to reason about.
Just wanted to draw your attention to two pull requests, which introduce additional tests.
Might rewrite the matcher, but first things first.