Fix semantic highlighting for role files:

+ more careful handling/preservation of flag Scanner._isOTSource

Also: revert workaround for JDT/UI mixup of isStatic/isPrivate
3 files changed