From d7907f8845ccfffc997972d5a6b1c6350f7e40b1 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 7 Dec 2018 17:29:16 +0100 Subject: [PATCH] a quick fix for CME during embedded token registration for XML/HTML --- .../src/com/intellij/ide/highlighter/HtmlFileHighlighter.java | 2 +- .../src/com/intellij/ide/highlighter/XmlFileHighlighter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java index 3638ae21b26b..ca91fdfdacae 100644 --- a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java +++ b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java @@ -79,7 +79,7 @@ public class HtmlFileHighlighter extends SyntaxHighlighterBase { return SyntaxHighlighterBase.pack(XmlHighlighterColors.HTML_CODE, ourMap.get(tokenType).toArray(EMPTY)); } - public static void registerEmbeddedTokenAttributes(Map _keys1, + public static synchronized void registerEmbeddedTokenAttributes(Map _keys1, Map _keys2) { HashSet existingKeys = new HashSet<>(ourMap.keySet()); XmlFileHighlighter.addMissing(_keys1, existingKeys, ourMap); diff --git a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java index b7d9aa4cb0c3..0051caa3063a 100644 --- a/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java +++ b/xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java @@ -110,7 +110,7 @@ public class XmlFileHighlighter extends SyntaxHighlighterBase { return ourMap.get(tokenType).toArray(EMPTY); } - public static void registerEmbeddedTokenAttributes(Map _keys1, + public static synchronized void registerEmbeddedTokenAttributes(Map _keys1, Map _keys2) { HashSet existingKeys = new HashSet<>(ourMap.keySet()); addMissing(_keys1, existingKeys, ourMap);