From aa0206a3cbca648bccf19c73c8bfb8f94d9a99bb Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Thu, 21 Feb 2019 14:58:13 +0300 Subject: [PATCH] fix serialization (IDEA-CR-43821) --- xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java index 006f0527da31..e13858f2eb87 100644 --- a/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java +++ b/xml/xml-psi-impl/src/com/intellij/lexer/BaseHtmlLexer.java @@ -303,7 +303,7 @@ public abstract class BaseHtmlLexer extends DelegateLexer { seenContentType = (initialState & SEEN_CONTENT_TYPE) != 0; seenStylesheetType = (initialState & SEEN_STYLESHEET_TYPE) != 0; if (seenTag || seenAttribute) { - int stack = (initialState & SEEN_STYLE_SCRIPT_MASK) >> SEEN_STYLE_SCRIPT_SHIFT + 1; + int stack = ((initialState & SEEN_STYLE_SCRIPT_MASK) >> SEEN_STYLE_SCRIPT_SHIFT) + 1; scriptStyleStack[0] = stack / 3; scriptStyleStack[1] = stack % 3; } @@ -424,7 +424,7 @@ public abstract class BaseHtmlLexer extends DelegateLexer { state |= ((seenStylesheetType)?SEEN_STYLESHEET_TYPE:0); if (seenTag || seenAttribute) { - state |= (scriptStyleStack[0] * 3 + scriptStyleStack[1] - 1) << 9; + state |= (scriptStyleStack[0] * 3 + scriptStyleStack[1] - 1) << SEEN_STYLE_SCRIPT_SHIFT; } return state;