MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

a quick fix for CME during embedded token registration for XML/HTML

Browse Source
This commit is contained in:
peter
2018-12-07 17:29:36 +01:00
parent 45bde88c5a
commit d7907f8845
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/ide/highlighter/HtmlFileHighlighter.java
+1 -1
View File
@@ -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<IElementType, TextAttributesKey> _keys1,
public static synchronized void registerEmbeddedTokenAttributes(Map<IElementType, TextAttributesKey> _keys1,
Map<IElementType, TextAttributesKey> _keys2) {
HashSet<IElementType> existingKeys = new HashSet<>(ourMap.keySet());
XmlFileHighlighter.addMissing(_keys1, existingKeys, ourMap);
xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlFileHighlighter.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class XmlFileHighlighter extends SyntaxHighlighterBase {
return ourMap.get(tokenType).toArray(EMPTY);
}
public static void registerEmbeddedTokenAttributes(Map<IElementType, TextAttributesKey> _keys1,
public static synchronized void registerEmbeddedTokenAttributes(Map<IElementType, TextAttributesKey> _keys1,
Map<IElementType, TextAttributesKey> _keys2) {
HashSet<IElementType> existingKeys = new HashSet<>(ourMap.keySet());
addMissing(_keys1, existingKeys, ourMap);