Fix regressions in CodeCompletionTest:
- CompletionScanner was missing one part of our adaptation
- fix merge bug in CompletionEngine
2 files changed