From d03c8a5956f9eda5927a26e48b8b25c2b095f7da Mon Sep 17 00:00:00 2001
From: Piotr Tomiak <piotr.tomiak@jetbrains.com>
Date: Thu, 14 Mar 2019 17:38:30 +0100
Subject: [PATCH] WEB-35820 Issue with spellchecking an expression with & and ;

---
 .../intellij/spellchecker/inspections/PlainTextSplitter.java  | 1 +
 .../testData/inspection/commentsWithMistakes/test.txt         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java b/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
index c1aa189108e3..35722bf56bf7 100644
--- a/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
+++ b/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
@@ -75,6 +75,7 @@ public class PlainTextSplitter extends BaseSplitter {
           TextRange found = matcherRange(range, matcher);
           till = found.getStartOffset();
           if (badSize(from, till)) {
+            from = found.getEndOffset();
             continue;
           }
           wRange = new TextRange(from, till);
diff --git a/spellchecker/testData/inspection/commentsWithMistakes/test.txt b/spellchecker/testData/inspection/commentsWithMistakes/test.txt
index b5c3a46c78b1..55589a76654d 100644
--- a/spellchecker/testData/inspection/commentsWithMistakes/test.txt
+++ b/spellchecker/testData/inspection/commentsWithMistakes/test.txt
@@ -1,2 +1,4 @@
 simple <TYPO descr="Typo: In word 'ttest'">ttest</TYPO> file (just plain text)
-русский (например) без словаря не проверять!!!
\ No newline at end of file
+русский (например) без словаря не проверять!!!
+data && !changed; else
+data && !<TYPO descr="Typo: In word 'changsed'">changsed</TYPO>; else