fix highlighting caps-follow-by-s matching
@@ -24,7 +24,7 @@ kReStrings = re.compile(
r"(\"\"\".*?(?<!\\)\"\"\")|('''.*?(?<!\\)''')|(\".*?(?<!\\)\")|('.*?(?<!\\)')")
# The first group is a hack to allow upper case pluralized, e.g. URLs.
kReSubwords = re.compile(
- '(?:[A-Z]+s)|(?:[A-Z][a-z]+)|(?:[A-Z]+(?![a-z]))|(?:[a-z]+)')
+ r'(?:[A-Z]{2,}s\b)|(?:[A-Z][a-z]+)|(?:[A-Z]+(?![a-z]))|(?:[a-z]+)')
kReSubwordBoundaryFwd = re.compile(
'(?:[_-]?[A-Z][a-z-]+)|(?:[_-]?[A-Z]+(?![a-z]))|(?:[_-]?[a-z]+)|(?:\W+)')
kReSubwordBoundaryRvr = re.compile(
