Improve highlighting more

[aaronjensen]

Some additional matching improvements and a refactor

• Handle filename matching
• Prefer matching touching letters, ab_b_c will match the first ab
• Clean up code

[JazzCore]

Very nice, thanks! I've tested it a bit and didn't found any issues, merging now.