Backport: Fix bug where changing identifier sets in lexers preserved previous identifiers.

Backport of changeset 7473:5d760343adde.

1 files changed, 12 insertions, 0 deletions

diff --git a/lexlib/SubStyles.h b/lexlib/SubStyles.h
index 3e99efe83..f9bdfe65c 100644
--- a/lexlib/SubStyles.h
+++ b/lexlib/SubStyles.h
@@ -61,7 +61,19 @@ public:
 		return (style >= firstStyle) && (style < (firstStyle + lenStyles));
 	}
 
+	void RemoveStyle(int style) {
+		std::map<std::string, int>::iterator it = wordToStyle.begin();
+		while (it != wordToStyle.end()) {
+			if (it->second == style) {
+				it = wordToStyle.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
+
 	void SetIdentifiers(int style, const char *identifiers) {
+		RemoveStyle(style);
 		while (*identifiers) {
 			const char *cpSpace = identifiers;
 			while (*cpSpace && !(*cpSpace == ' ' || *cpSpace == '\t' || *cpSpace == '\r' || *cpSpace == '\n'))