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

Fixed exception when LayeredLexer and tokens with 0 length

Browse Source
This commit is contained in:
Andrey Vokin
2015-08-24 10:16:38 +03:00
parent 6d0e8f1f4a
commit b95ea57798
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
+6 -2
View File
@@ -186,6 +186,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc
int lastTokenStart = -1;
int lastLexerState = -1;
IElementType lastTokenType = null;
while (myLexer.getTokenType() != null) {
if (startIndex >= oldStartIndex) break;
@@ -193,7 +194,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc
int tokenStart = myLexer.getTokenStart();
int lexerState = myLexer.getState();
if (tokenStart == lastTokenStart && lexerState == lastLexerState) {
if (tokenStart == lastTokenStart && lexerState == lastLexerState && myLexer.getTokenType() == lastTokenType) {
throw new IllegalStateException("Error while updating lexer: " + e + " document text: " + document.getText());
}
@@ -205,6 +206,7 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc
break;
}
startIndex++;
lastTokenType = myLexer.getTokenType();
myLexer.advance();
lastTokenStart = tokenStart;
lastLexerState = lexerState;
@@ -214,18 +216,20 @@ public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDoc
int repaintEnd = -1;
int insertSegmentCount = 0;
int oldEndIndex = -1;
lastTokenType = null;
SegmentArrayWithData insertSegments = new SegmentArrayWithData();
while(myLexer.getTokenType() != null) {
int tokenStart = myLexer.getTokenStart();
int lexerState = myLexer.getState();
if (tokenStart == lastTokenStart && lexerState == lastLexerState) {
if (tokenStart == lastTokenStart && lexerState == lastLexerState && myLexer.getTokenType() == lastTokenType) {
throw new IllegalStateException("Error while updating lexer: " + e + " document text: " + document.getText());
}
lastTokenStart = tokenStart;
lastLexerState = lexerState;
lastTokenType = myLexer.getTokenType();
int tokenEnd = myLexer.getTokenEnd();
data = packData(myLexer.getTokenType(), lexerState);