Updating to Xcode beta 5 and today's Tahoe beta made no difference, I might add.

I'm going to try and refine my project some more first, I found another project (Yap) which gets all the ranges I expect for the same file, so I'm hopeful I've simply missed something in my setup.