diff options
Diffstat (limited to 'platform/editor-ui-ex/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java index 443e4fb3ccac..77092d91a6c1 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java @@ -34,6 +34,7 @@ import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Comparing; import com.intellij.psi.tree.IElementType; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; @@ -77,8 +78,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc public final synchronized boolean checkContentIsEqualTo(CharSequence sequence) { final Document document = getDocument(); - if (document != null) return document.getText().equals(sequence.toString()); - return false; + return document != null && Comparing.equal(document.getImmutableCharSequence(), sequence); } public EditorColorsScheme getScheme() { diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java index 330dcfdf5e6a..6a3dd82b237e 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java @@ -213,7 +213,7 @@ public abstract class PlatformIdTableBuilding { } OccurrenceConsumer occurrenceConsumer = new OccurrenceConsumer(null, true); for (IndexPattern indexPattern : indexPatterns) { - Pattern pattern = indexPattern.getPattern(); + Pattern pattern = indexPattern.getOptimizedIndexingPattern(); if (pattern != null) { Matcher matcher = pattern.matcher(chars); while (matcher.find()) { diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java index 09b379e8078b..d955354cca7f 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java @@ -127,7 +127,7 @@ public class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Integer> @Override public int getVersion() { - return 7; + return 8; } @Override |